Merge branch 'pr-55'

This closes #55