refactoring
Merge pull request #2 from JoelHoskin/loc_query

Ready to merge?