Merge branch 'pr-50'

This closes #50