some tidying up
Merge branch 'master' of github.com:ejeliot/mac-arabic-fix