Merge pull request #9 from meriko/master

Fix for broken regex for channel id