Merge pull request #1 from quanlinc/master

与quanlinc的同步
Merge pull request #3 from quanlinc/master

与全麟同步
增加编码规范
Merge pull request #4 from jeff5665/master

增加编码规范