Establish location service 2.
Merge pull request #37 from yanivgal/EstablishLocationService2

Establish location service 2.