initial workings of heartbeats
Merge branch 'master' of https://github.com/jcharette/controller