Moved DownloadHandler definition a bit.
More DownloadHandler improvements.
Fixed dependencies.
Merged with master