Added basic right-to-left support