Merge pull request #3 from zond/master

Improved the testing a bit
merge