First fix for broken channel
Merge pull request #17 from meriko/master

First fix for broken channel