Merge branch 'pr-41'

This closes #41