Merge pull request #81 from jemygraw/master

Merge pull request #1 from qiniu/master
Merge pull request #2 from qiniu/master

Merge pull request #81 from jemygraw/master