Added internationalization and testing.