Merge pull request #50 from suntinghui/master

LJ
Merge pull request #72 from liaojia/master

lj