Title: Fixed file uploader

Commit: Simon, Robert