modified colors
Merge origin/master