Fix #959, and add support of escape
Fix import
Merge pull request #962 from emmanuel-keller/master

Fix #959, and add support of escape