Merge "adjusting the calculation of errorperbit"