Class for color, base hierarchy...
Typo
Merge branch 'release/1.0'