Merge pull request #56 from liaojia/master

Lj
Merge pull request #57 from liaojia/master

dd
Merge pull request #41 from suntinghui/master

pull