fix bugs (upload errors)
Merge remote-tracking branch 'origin/master'