Added a client override option via query parameter
Merge remote-tracking branch 'origin/port80'