Fix unit test
Channel sub bug fix
Merge pull request #43 from boiving/master

Unit test