Cleanup and add tests for convert_channels
Merge pull request #6 from tomaka/clean-convert-channels

Cleanup and add tests for convert_channels