Merge pull request #46 from liaojia/master

pull
Merge pull request #32 from suntinghui/master

LJ