Fix non-#channels and single-symbol channels (#)
Merge pull request #508 from glowing-bear/fix-non-hash-channels

Fix non-#channels and single-symbol channels (#)