Added a unique id for each client message - Fixes #517