Merge branch 'pr-62'

This closes #62