Merge branch 'pr-148'

This closes #148