Merge pull request #538 from leider/master

1st steps in client-side localization