Added drawing of color when event is passed
Merge remote-tracking branch 'origin/master'