Merge pull request #48 from liaojia/master

LJ
STH
Merge pull request #34 from suntinghui/master

LJ