not so pastel
Merge pull request #1683 from diegosarmentero/master

not so pastel