Added process-level heartbeats, unit tests, and some bug fixes
Merge pull request #2 from jonp/pull-request-for-upstream

Added process-level heartbeats, unit tests, and some bug fixes