Incorporated unicode improvements from Sibylle Koczian