Merge pull request #35 from suntinghui/master

更新
Merge pull request #45 from liaojia/master

pul