Merge pull request #268 from danvk/color-option