fixed heartbeats
added remarks
integration
Merge branch 'master' of https://github.com/allandanos/heartbeat