Merge branch 'pr-225'

This closes #225