Merge branch 'pr-54'

This closes #54