Issue #151 Fixed downloader