Merge pull request #44 from suntinghui/master

Lj
ip
Merge pull request #65 from liaojia/master

lj