LJJ
Merge pull request #4 from liaojia/master

LJJ