Merge branch 'pr-24'

This closes #24