CR_fixes
Changed distance calculation method
CR_fixes
CR_fixes
Merge pull request #1 from Wikia/CR_fixes

Fixes after CR