Merge branch 'pr-253'

This closes #253