Tried to merge location code into the develop branch.
Merged get-location code into develop.