由jujiang进行修改
Merge pull request #4 from jujiang/master

提交一个branch到base