Started working on channels
Merge branch '0-7-0-BRANCH' of https://github.com/careck/cmfive into 0-7-0-BRANCH