fix bug
remove proxy middleware
Merge remote-tracking branch 'origin/master'