Issue 71

Issue 78