Fix downloader

Refers: #20, #21