Merge pull request #195 from WoltLab/conversation-handler