More work to add support for hindi #15