Issue 75

Issue 78

Issue 80