Merge pull request #23 from suntinghui/master

push
Merge pull request #34 from liaojia/master

push