Merge pull request #87 from liaojia/master

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

lj