Issue 70

Issue 72

Issue 91