Added escape characters on fieldnames
Merge branch 'hotfix/escapechara'