Now upload script will jump entry and not crash if an error happens
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into towardsVer3