fixed Codel Chooser bug
Merge remote-tracking branch 'origin'
fixed CC error