规范化代码格式
Merge pull request #11 from liaoxuezhi/master

规范化代码格式
Merge pull request #3 from gmuteam/master

sync master