Merge pull request #7 from haxmb/master

Update review so we can add more features in testing