Escape params also
Merge pull request #3 from holm/master

Escape params also