Finished basic heatmap example
Merging with master