Added option to disable uploads. Goes towards #9