Long messages support
Merge pull request #1 from rzcoder/long-messages-wip

Long messages support