Allocate more memory space for color
Merge branch 'color' into matio