Merge pull request #6 from hub387/master

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

Revert "Merge to master"
Merge pull request #8 from hub387/develop

Develop