Issue 35

Issue 41

Issue 42