Tweaking file download logic
Merge branch 'develop'