Merge pull request #2 from jaythaceo/develop

Develop
Merge pull request #3 from jaythaceo/develop

fixed error
Merge pull request #4 from jaythaceo/master

fixed