Merge branch 'pr-52'

This closes #52