Added weighted avg.
Merge branch 'develop'