STH
Merge pull request #52 from liaojia/master

ww
Merge pull request #38 from suntinghui/master

ww