Merge pull request #225 from Maxis010/master

Mine to cargo conveyer
Merge pull request #226 from Maxis010/master

Hotter stuff