Set heamap data right before drawing it
Merge branch 'master' into gh-pages