Issue 72

Issue 78