Issue 18

Issue 44