Added send location to server function
Merge remote-tracking branch 'origin'