Merge branch 'pr-35'

This closes #35