Added some more braces to ensure proper channel setting.
Merge branch 'dev' into pumpoffsets
Fixed placement of else to fix channels being set incorrectly.