internationalization and fix for #55