Fixed wrong rgb color
Merge Master