Merge branch 'pr-61'

This closes #61