STH
STH
Merge pull request #43 from liaojia/master

pull
Merge pull request #34 from suntinghui/master

pull