Merge pull request #781 from tonyrd/development

fixed tracking code for download