first commit
More tests
Merge pull request #1 from ChrisBeaumont/master

First commits