Merge branch 'pr-254'

This closes #254