Issue 37

Closes #37