check to see if the callback was a function
Merge remote-tracking branch 'origin/master'