Merge pull request #2 from liaojia/master

Merge pull request #2 from suntinghui/master
Merge pull request #3 from liaojia/master

LJJ
Merge pull request #4 from liaojia/master

LJJ
STH
Merge pull request #3 from suntinghui/master

pull