Merge pull request #12 from cmr/master

Cargo/Update for master
channel: fix infinite recursion