Merge pull request #91 from hartsock/master

make testing actually possible