Changed to persistent connection
Merge remote-tracking branch 'origin'
Adding in portconf