Fixed bug. Text works, just need to change the color.
Merge remote-tracking branch 'upstream/master'