fixing some issues with the notification color branch
Merge pull request #1638 from diegosarmentero/master

fixing some issues with the notification color branch