Merge pull request #4 from moritz/master

Various improvements
fix joining channels

by forcing sink context on the for loop.
Otherwise it only works when called in sink context.