Daltonic Merge pull request #10 from Daltonic/cometchat