Merge pull request #1 from xiaohuazhu/develop

Develop
Merge pull request #3 from xiaohuazhu/develop

Merge from develop
Merge pull request #4 from xiaohuazhu/develop

Develop
Merge pull request #5 from xiaohuazhu/master

Master