And again
Merge pull request #18 from johnb30/tests

And again