Revert "Merge to master"
Merge pull request #7 from hub387/revert-6-master

Revert "Merge to master"