Merge pull request #61 from suntinghui/master

lj
Merge pull request #82 from liaojia/master

lj