Refactor HeatMap
Merge pull request #1 from mtrebell/master

Refactor HeatMap