Merge pull request #49 from suntinghui/master

lj
Merge pull request #71 from liaojia/master

LJ