Merge pull request #1 from moonfox/develop

merge from origin branch
Merge pull request #3 from gagahappytest/develop

Merge pull request #1 from moonfox/develop