Merge pull request #45 from suntinghui/master

pul
Merge pull request #62 from liaojia/master

pull