This fixes the errors and cleans the output even more :)
Merge pull request #4 from kratsg/master

This fixes the errors and cleans the output even more :)