Merge pull request #151 from ariard/channel_manager_refactor