Merge branch 'pr-53'

This closes #53