Output formating
Merge pull request #1 from frdeso/master

Output formating