Merge branch 'develop'
small fixes in downloads