Revert "Merge branch 'pr/12', closes #12"

This reverts commit edd509fdb1cc72e205eee3a158d81270fe1c2afe.