Change the handlers to receive cb functions
Merge pull request #1 from grbcruz/master

Change the handlers to receive cb functions