[button] Replace dirty hack with a better, more reliable one
Merge pull request #6 from faenil/buttonfix

[button] Replace dirty hack with a better, more reliable one