Merge pull request #30 from mkirk8/master

fixing colour logic