added callback manager
Merge branch 'master' of github.com:colbyr/wallaby