Implemented issue #1 (internationalization)