STH
STH
Merge pull request #71 from liaojia/master

LJ
Merge pull request #50 from suntinghui/master

LJ