Merge pull request #76 from liaojia/master

lj
STH
STH
STH
STH
STH
STH
STH
STH
STH
Merge pull request #55 from suntinghui/master

lj