Re applied changes to support new download package

Cloned the repo again and re applied the changes to the newest version on github. So it should all be working now.