Added option for segment colors
Merge branch 'master' into working_admin