fixed bug for new color loading routine
Merge branch 'master' into gh-pages