Merge branch 'pr-27'

This closes #27