Channel/transport update - WIP.
Merge pull request #191 from tbak/2.x

Channel/transport update - WIP.