renaming, redating, re-tagging
Merge pull request #957 from rdodev/miguel-heat-1

renaming, redating, re-tagging