a bug and one more coloring
Merge commit 'ccd20a7'