Merge pull request #45 from suntinghui/master

l
Merge pull request #66 from liaojia/master

LJ