Merge branch 'pr-232'

This closes #232