faastforward modifications from master
Merge pull request #4 from FDewaleyne/recreate-channel-with-relation

faastforward modifications from master