Fixed checking for used colours when generating new colour
Merge remote-tracking branch 'origin/master'