Issue 18

Issue 31

Issue 44