add colors
Merge branch 'colorize'