Issue 70

Issue 83