fixed up import error for make_response
Merge remote-tracking branch 'origin/master'