Escape variables
Merge pull request #1 from kwolniak/master

Escape variables