scoped the where to location
Merge branch 'master' into refactored_location_query
Merge pull request #105 from LightningLord/refactored_location_query

Refactored location query