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

Fix #959, and add support of escape