calculateDistance fixed
Merge branch 'PeterLeker' into newDeveloper