Fixed: get user location bug...
Merge remote-tracking branch 'origin/master'