support channel #5
fix #5
fix tests #5