minor fix for IE
some bugfixes for colors
Merge branch 'master' into gh-pages