Merge pull request #16 from suntinghui/master

Ljj
Ljj
Merge pull request #23 from liaojia/master

Ljj