Fixes
 Fix to upload file
Merge branch 'master' into pepe