Removed Name and Description from config file so that it doesn't override registry setting.
added check to discard heartbeats from the past
Merge branch 'release-1.0.0' into develop