Merge pull request #63 from dannybutler/master

Fixing single page aggregate sql issues
fix graph
Merge pull request #64 from alexanderson/master

fix graph