Issue 70

Issue 75