fix channel
Merge branch 'master' into theradiocc