修改样式
Merge remote-tracking branch 'upstream/master'
Merge pull request #28 from jarvys/master

修改样式
Merge pull request #29 from longyueyi0610/master

fix bug
修复有测试代码