Made a lot of changes to the output to make it cleaner.
Merge pull request #3 from kratsg/master

Made a lot of changes to the output to make it cleaner.