Merge branch 'pr-234'

This closes #234