Merge branch 'pr-64'

This closes #64