ENH: added tags option
REF: changed tags to channels
FIX: channels
ENH: fixed channel arg
Merge branch 'master' into feature/tags
Merge branch 'feature/tags'