Merge pull request #9 from derek63/master

Add tests