Issue 50

Issue 52