Add tests and testling
Merge pull request #5 from ForbesLindesay/master

Add tests and testling