Merge pull request #37 from suntinghui/master

pii
Merge pull request #49 from liaojia/master

pu;l