added localisation service
Merge of @qwlouses changes