Merge branch 'pr-66'

This closes #66