Updated for better support of escaped characters in Strings

Signed-off-by: Lucas Bajolet <lucas.bajolet@gmail.com>