Issue 40

Issue 72