Supported internationalization. #3 fix