Sources support added, improved channel handling
Merge remote-tracking branch 'upstream/master'