Merge pull request #1 from katerina7479/master

Merge from trunk
Adjust the _is_equals() method which would not work correctly if both
color names were None. Python treats None == None as true, but that may
not be correct here.
Merge pull request #13 from tjoneslo/Fix-color-test

Fix color test