Issue 32

Issue 70