Merge pull request #3 from suntinghui/master

pull
Merge pull request #5 from liaojia/master

pull