Download + Magic Guard fixes
Merge pull request #1143 from Fuzzysqurl/armaldo

Download and Magic Guard fixes