Attach correct listener based on input
Merge pull request #8 from maestrooo/mixin-refactor

Attach correct listener based on input