Averaging from distibution
Matplotmerge
Merge branch 'master' of github.com:tomsercu/hps
Tested and validated hack