Local heartbeat
Merge pull request #43 from chamerling/master

Local Heartbeat