Merge pull request #160 from ariard/channel_manager_refactor_all