Merge pull request #2 from Peppie23/distance_calculation

Changed the distance calculation to stock
Merge pull request #1 from jrossignol/master

Sync master