develop
Merge pull request #1 from wanshibo/develop

merge from develop