Merge pull request #1 from dingchaoyan1983/dev

Dev