Issue 65

Issue 69

Issue 73