Merge branch 'pr-39'

This closes #39