Merge pull request #18 from suntinghui/master

LJ
Merge pull request #27 from liaojia/master

Lj