Created function to get location
Merge branch 'jesus'