Merge branch 'pr-30'

This closes #30