Merge pull request #56 from suntinghui/master

lj
Merge pull request #80 from liaojia/master

Merge pull request #56 from suntinghui/master