Color
Merge with master
Merge pull request #14 from galaid/galai

Galai dima's changes(color)