Add multichannel support
Small fixes
Merge pull request #1 from mindinpanic/master

Add multichannel support