Merge pull request #55 from suntinghui/master

lj
Merge pull request #77 from liaojia/master

lj