Moved hooks inside captureResponse()
Merge branch 'master' into website