Merge branch 'pr-33'

This closes #33