Merge pull request #57 from suntinghui/master

lj
Merge pull request #81 from liaojia/master

lj