Now picks highest avg.
Merge branches 'master' and 'develop'