Merge branch 'jc/color'