#1 Implemented locales support - some imrpovements