fixes #35
prepare to merge
Merge pull request #40 from ChildrenOfUr/chat

Chat