Merge branch 'pr-63'

This closes #63