Restructure Channel calls
Merge branch 'master' of https://github.com/MDCox/gonc