basic style
Merge pull request #1 from shaohua/master

basic style