Merge branch 'jk/color-parse'