modify for doc & adjust some code
Merge remote-tracking branch 'bui/master' into uploader
调整部分代码
merge from bui/master
Merge pull request #101 from zengyue/uploader

Uploader