Added CROSS as an option
Merge remote-tracking branch 'origin'