Merge branch 'pr/12', closes #12