STH
Merge pull request #65 from liaojia/master

uu
STH
Merge pull request #49 from suntinghui/master

dd