Merge branch 'pr-245'

This closes #245