Merge branch 'pr-150'

This closes #150