Feature/Codechange: Update by F. Schn.
Feature: Add late client connection (by F.Schn.)