Bug fix callbacks.
Merge pull request #64 from dixso/develop

Bug fix callbacks.