fixed upload checking
Merge origin/master