object color + tristan's version
Merge pull request #17 from afsanee/pull-request-1

object color + tristan's version