Added an option to prevent the escaping