Merge branch 'pr-31'

This closes #31