Merge pull request #189 from sunyc/master

Revamp heartbeat implementation
Merge pull request #191 from sunyc/master

Fix #190: user.cc implementation issue.
Merge pull request #192 from sunyc/master

fix coverity_scan branch matching
fix coverity_scan branch matching