Merge pull request #9 from obf73/master

added some testing
Merge pull request #10 from obf73/testing

Merge pull request #9 from obf73/master