Merge branch 'pr-65'

This closes #65