Merge branch 'pr-25'

This closes #25