Merge branch 'pr-12'

This closes #12