Merge pull request #4 from suntinghui/master

ljj
fhyf
Merge pull request #6 from liaojia/master

hh