Merge branch 'pr-59'

This closes #59