Merge pull request #1 from dingchaoyan1983/dev

Dev
Merge pull request #2 from dingchaoyan1983/master

Merge pull request #1 from dingchaoyan1983/dev