Merge branch 'colorizer'