Issue 64

Issue 72