Merge pull request #1 from suntinghui/master

STH
Merge pull request #1 from liaojia/master

lj