update server port to be var
Merge remote-tracking branch 'upstream/master'