Restrict scale in averaging values.
Fix test.
Merge branch 'master' into scale
Fix test
Merge pull request #99 from tonyhuang/scale

Restrict scale in averaging values.