enhance callback support
Merge branch 'master' of github.com:smalot/magento-client