Ljj
Merge pull request #24 from liaojia/master

Ljj