Added method for calc distance between two coords.
Merge remote-tracking branch 'upstream/master'

Merged upstream.
Merged conflict