Support plain console mode
Merge remote-tracking branch 'r0mai/master'