Fix for new client API
Fix for new Callback API
Merge pull request #4 from alexp-sssup/master

Fix for new client API