Add channel check
Merge pull request #8 from cornedor/correction-channel-fix

Add channel check