Merge colorized output into master