Merge pull request #81 from liaojia/master

Merge pull request #60 from suntinghui/master
Merge pull request #61 from suntinghui/master

lj