merged with latest from upstream/master, and updated the GCSHeartbeat code.
Merge pull request #448 from ne0fhyk/master

Updated the GCSHeartbeat code...