add arguments to the server for host:port
Merge remote-tracking branch 'origin/master'