Tamani Fix
Helspawn Fix
Merge pull request #585 from IndirectOne/master

Tamani Fix