Issue 65

Issue 68

Issue 70