Merge pull request #57 from apimesh/locationFix

Fix location matching and proxy APIs