Merge pull request #99 from berenm/master

Improved color framework