Merge branch 'pr-156'

This closes #156