Properly escape button params
Merge pull request #15 from adrianlang/master

Properly escape button params