Merge branch 'pr-40'

This closes #40