Issue 50

Issue 50