added locale support