Merge pull request #46 from ariard/useless_todo_channelmanager