Merge branch 'pr-60'

This closes #60