Merge pull request #18 from confpub/master

Update and playing with colors
Merge remote-tracking branch 'upstream/master'