STH
Merge pull request #64 from liaojia/master

LJ
Merge pull request #44 from suntinghui/master

Lj