add Distance
Merge branch 'refactor-distance'