Merge pull request #203 from lliss/topic/fix-location-issues

Topic/fix location issues