Issue 20

Issue 30

Issue 32