Added support for custom download file names;