Merge branch 'pr-8'

Closes #8