Merge pull request #1 from shaohua/master

basic style
More style
Merge pull request #1 from sheng168/master

update style