Added locale support requested in #54