Fix for download problem + increase minimum size of the file that can be upload
Merge remote-tracking branch 'origin/master'