Merge pull request #13 from ParadiseSS13/master

Merge From Master
Magboots Fix
Merge pull request #55 from Fox-McCloud/Mag-Fix

Mag fix