Merge branch 'pr-28'

This closes #28