Feature/locale support fixed