Merge pull request #4 from jaythaceo/master

fixed
Merge pull request #5 from jaythaceo/develop

Merge pull request #4 from jaythaceo/master