修改
Merge pull request #2 from ZhouJiang/master

update