Merge pull request #587 from goldrush/master

reverse
Merge pull request #588 from goldrush/develop

Merge pull request #587 from goldrush/master