Fix for callbacks that do not fire
Merge pull request #75 from stiang/master

Fix for callbacks that do not fire