fix some errors
fix error of upload to multiple place
Merge remote-tracking branch 'origin/master'