Version with all charts moved to heat map
Merge remote-tracking branch 'origin/master'