Escape some problematic characters
Merge pull request #3 from laurentsebag/master

Fix for issue #1