Fixes #99
Repair message sending after fixing #127
Merge pull request #142 from aesedepece/master

Fixes #99 and updates message sending after fixing #127