Refactored file download
Merge branch 'develop' into media