Merge pull request #67 from liaojia/master

Merge pull request #46 from suntinghui/master
Merge pull request #47 from suntinghui/master

LJ