Fixed undefined variables in Q/response handler
Merge branch 'master' into feature/Handlebars