Hi Fangrui, Hi Rasmus,

   Any comments on the attached patch ?

   It implements the basename and % character changes as previously discussed.

Cheers
   Nick