Feature/color

Fixes #579