Fixes for escaping and unescaping previously illegal characters
Merge pull request #390 from fahadhatib/develop

Fixes for escaping and unescaping previously illegal characters