added sorting by distance
Merge remote-tracking branch 'origin'