Fixes #85.  There was actually a bug that over-counted the denominator when calculating averages.