[Bugfix] bugfix
[change] code style
[change] code style
Merge pull request #95 from lixiaopeng/master

[Bugfix] bugfix