Solved Issue#7
Merge branch 'ISS_7'
Added more colors
Merge branch 'master' into ISS_6