Fix #959, and add support of escape
Merge pull request #960 from emmanuel-keller/1.5

Fix #959, and add support of escape