Hotter stuff
Merge pull request #226 from Maxis010/master

Hotter stuff