Fixed file naming (should also now download with file extension)