Revert "Merge pull request #19 from rugggg/master"
Merge pull request #7 from rugggg/revert-6-master

Revert "Merge pull request #19 from rugggg/master"