Merge branch 'pr-227'

This closes #227