Added multilanguage support to locator

this fixes issue #1