Merge branch 'pr-255'

This closes #255