Merge branch 'pr-229'

This closes #229