Add aggregation example
Fix size of function ellipses
Merge remote-tracking branch 'origin/master'