Merge branch 'pr-219'

This closes #219