Merge pull request #76 from liaojia/master

lj
Merge pull request #57 from suntinghui/master

lj