Fixed alot of shit
Merge pull request #153 from CarlRapp/TENFIRE

Tenfire
Merge pull request #154 from CarlRapp/master

Update