Bug Fix and support for color space