Issue 18

Issue 17