Merge pull request #58 from suntinghui/master

lj
Merge pull request #78 from liaojia/master

lj