STH
Merge pull request #75 from liaojia/master

Lj
Merge pull request #54 from suntinghui/master

lj