Merge changes into my master
Issue #118: Basic handling of OTR messages in the chat window