Merge pull request #653 from zouyx/develop

Fix: Merge master commit to develop