Merge branch 'pr-36'

This closes #36