Merge pull request #198 - IRCv3 improvements