Refactor downloader
Bug fix
0.4.3