Merge pull request #22 from Currfyg/master

Merge
Lots of bug fixes.
Using nio for much faster downloads.