rounded average
Merge branch 'dev'