Merge pull request #5 from wangzhaojiang/master

update
更新代码
更新代码
Merge pull request #22 from dazzle111/master

更新代码