Merge pull request #589 from goldrush/master

reverse
Merge pull request #590 from goldrush/develop

Merge pull request #589 from goldrush/master