Merge branch 'pr-26'

This closes #26