CSS colors fix
Merge branch 'master' into color
Merge pull request #8 from Kirens/color

Color