Merge pull request #1 from yanchangyou/master

支持版本开发
Merge remote-tracking branch 'origin/master' into gh-pages
Merge pull request #2 from yanchangyou/gh-pages

test