Merge branch 'pr-258'

This closes #258