Merge branch 'pr-58'

This closes #58