Merge branch 'pr-51'

This closes #51