Add rollup indicator
Fix problem with inconsistent measurements data.
Merge pull request #491 from MastodonC/feature/better-charting

Better charting