Issue #48 heartbeat messages should be updated to avoid to many messages