Improvements

Changed the way the file name is passed to the Handle, this way is
better for some download manager