Merge pull request #298 from dbellettini/2.7

FileDownload bugfixing and enhancement