Merge branch 'colorize'

Fixes #1