Made the output more pretty.
Merge branch 'master' into graphite4