finishing up heartbeat functionality
Merge pull request #24 from timkettering/master

finishing up heartbeat functionality