Merge pull request #214 from Flupsy/channel-mode-N