Merge pull request #17 from suntinghui/master

Ljj
Merge pull request #25 from liaojia/master

LJ