Merge pull request #16 from CarlRapp/master

update
Cleaned up old code
Merge pull request #30 from CarlRapp/master

Update
Merge pull request #31 from CarlRapp/TENFIRE

Tenfire