Merge pull request #188 from tbak/2.x

2.x reworked channels
Channel/transport update - WIP.