Merge pull request #7 from kuzentio/chat

Chat
Merge pull request #8 from kuzentio/master

Merge pull request #7 from kuzentio/chat