Merge branch 'pr-45'

This closes #45