Remove dedicated callback function types. Improve consistency of callback function names.
Merge pull request #15 from mewpull/master

Remove dedicated callback function types. Improve consistency of callback function names.