Merge branch 'pr-47'

This closes #47