Channel mapping

This fixes issue #156