UPDATE
Merge remote-tracking branch 'origin/dev' into cj
Merge pull request #11 from imcj/cj

合并cj代码