Collapsing gets new dist_km and dist_miles functions
Merge pull request #61 from emmanuel-keller/1.5

Collapsing gets new dist_km and dist_miles functions