add "show ChannelNumber / show ChannelName" to settings
Merge remote-tracking branch 'origin/master'