Fix callbacks
Merge pull request #30 from tapir/master

Fix callbacks