Made output more readable
Merge origin/master