Merge pull request #33 from liaojia/master

LJ
Merge pull request #23 from suntinghui/master

push