Half done with implementation of channel
Merge remote-tracking branch 'upstream/master'