Issue 65

Issue 74