Merge pull request #6 from obf73/master

added some tests