Updated InputListener to be a bit more succinct and hopefully correct
Merge pull request #16 from mattforni/master

Updated InputListener to be a bit more succinct and hopefully correct