Merge pull request #53 from suntinghui/master

Lj
新加功能
Merge pull request #75 from liaojia/master

Lj