Merge pull request #224 from Tyroie/for-wreckedavent

Channel header improvements