Merge pull request #53 from pndiku/master

Fix non-unique message ID problem
* FIX: Regression introduced update, #53