Fix calculations
Merge pull request #21 from TeamWhat/fix_calculations

Fix calculations