Merge branch 'pr-247'

This closes #247