changed color float array to color object
Merge remote-tracking branch 'origin/master'