Add some more callbacks
Merge pull request #3 from mzikherman/master

@mzikherman => Add some more callbacks