Revert "Revert 689f545..e9f2994"

This reverts commit 60e1c30438366ffe12a13159ce03ea14edade330.
R
Merge branch 'master' of https://github.com/samkomo/GeoAlarm
distance calculated
distance calculated2
distance calculated3