Merge pull request #17 from kmarty/stable

Use 'Content-Disposition:' as filename of downloaded file
Merge remote-tracking branch 'upstream/stable' into stable