STH
Merge pull request #55 from liaojia/master

ee
Merge pull request #40 from suntinghui/master

ww