Color Change
Bug fixes
Merge branch 'color_change' into development