Merge branch 'pr-46'

This closes #46