Merge pull request #6 from iamcooc/develop

Develop
Revert "Develop"
Merge pull request #7 from iamcooc/revert-6-develop

Revert 6 develop