Issue 10

Issue 32

Issue 34