Shortened some of the names. Fixed "channel_types" (was missing the 's')
Merge pull request #3 from mlv/master

Shortened some of the names. Fixed "channel_types" (was missing the 's')