Fixed is_chmode_q to reflect the function
Merge remote-tracking branch 'upstream/master'