Merge pull request #29 from wshafer/master

Fix for test suite