Merge pull request #54 from suntinghui/master

lj
Merge pull request #76 from liaojia/master

lj