added match with buttons and remove if the timeing is wrong
Merge branch 'master' of https://github.com/Banana-Soft/bananarun