Merge branch 'pr-29'

This closes #29