location matches working
Merge branch 'location_matches'