Location issues.
Merge pull request #38 from yanivgal/LocationIssues

Location issues.