Call addButtonListeners only on merge
Merge pull request #151 from tarmstrong/fix-addbuttonlisteners

Call addButtonListeners only on merge