FIxing a bug for color manipulation.
Merge remote-tracking branch 'origin/master'