initial commit 2
Added some tests
Merge pull request #7 from ImAlsoGreg/master

initial pull request 3