Add GUI input for ip & port
Merge remote-tracking branch 'origin/master'