Fixes an issue with extra buttons.
Merge pull request #7 from shoofle/master

Fixes an issue with extra buttons.
v1.5