Changes to allow custom file name for downloads

This pull request coincides with a pull request for the imtables project