Issue 70

Issue 76