fixed formatting
fixed port info
Merge remote-tracking branch 'upstream/master'