Added default language settings
merged with remote branch