small changes
merge conflicts
Merge pull request #304 from mwernimont/master

Download file extension