Merge pull request #84 from CarlRapp/CarlRapp

Carl rapp
Merge pull request #85 from CarlRapp/master

update
Fixed comment
Merge pull request #86 from CarlRapp/TENFIRE

Tenfire
Merge pull request #87 from CarlRapp/master

Update