merge from uploader to pull
Merge remote-tracking branch 'bui/master'
Merge pull request #75 from zengyue/master

提交uploader