Use Content-Disposition filename if available
Slight refactor
Merge branch 'content-disposition'