Fixed download helper bug

Merged Sandeep S. Shewalkar requested to merge DevBranch into master