Merge branch 'pr-43'

This closes #43