Fix everything, no more double-counting.
Merge pull request #2 from kdungs/actuallyTheFormulaWasMeantDifferently

Fix everything, no more double-counting.