use request url instead of always using localhost
Merge remote-tracking branch 'origin/master'