Merge branch 'pr-68'

This closes #68