Have add-handler include the function arguments
Merge pull request #899 from MaxGabriel/addHandlerArguments

Have add-handler include the function arguments