STH
Merge pull request #63 from liaojia/master

ee
Merge pull request #47 from suntinghui/master

kk