trying again
Merge pull request #26 from johnb30/tests

trying again