Improved color support. Fixes #6