Update location resolver to limit returned locations
Merge remote-tracking branch 'upstream/master'
Merge pull request #88 from pradine/master

Update location resolver to limit returned locations