Merge pull request #41 from liaojia/master

yao
STH
STH
Merge pull request #42 from liaojia/master

bug修改
Merge pull request #33 from suntinghui/master

bug修改