Merge branch 'pr-37'

This closes #37