Channel join/leave message fixes
Merge pull request #21 from AGausmann/master

Channel join/leave message fixes