Some more Progress for the ServerManager
Minor change
Merge remote-tracking branch 'origin/master'