Improved localization
Release 2.2.0