Merge branch 'pr-38'

This closes #38