Merge pull request #388 from timschofield/develop

Develop
Merge pull request #389 from timschofield/develop

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

Fixes for escaping and unescaping previously illegal characters