Issue #595 - Add support for other languages including RTL languages