re applyed changes for new download package support
Merge pull request #3 from sjengfred/master

Re applied changes to support new download package