Merge pull request #7 from obf73/testing

Merge pull request #6 from obf73/master
refactoring
fixed merge conflicts