use make_response
Merge branch 'dev' into version
0.1.18