Fixed the callback
Merge branch 'master' into deploy