Escape variable names


Merge pull request #2 from asm89/patch-1

Escape variable names