Added colors
merge with master