ensure that callbacks are properly invoked
Merge pull request #2 from makeandbuild/master

ensure that callbacks are properly invoked