Merge pull request #161 from CarlRapp/master

Update
Fix and balance
bugfix
Merge pull request #162 from CarlRapp/TENFIRE

Tenfire