Merge branch 'feature/distance'