Merge pull request #158 from leider/master

Small fix & reverse color picking