Issue #13 fix for rtl layout