Merge pull request #39 from elaksana/master

Chat stuff.