Incoming ip should be included into message ID
Fixed buffer overflow
Fix tests
Merge remote-tracking branch 'upstream/master'