merged in additional escape characters from ptaoussanis