Maybe this time
Merge pull request #24 from johnb30/tests

Maybe this time