Merge pull request #71 from liaojia/master

pull
Merge pull request #53 from suntinghui/master

LJ