Improved handling of duplicates and prevent messages from disappearing
Merge pull request #270 from elandau/queue1

Improved handling of duplicates and prevent messages from disappearing