fixed bug on canvas and changed colors
Merge pull request #106 from scalableinternetservices/eivind

LGTM