Fix (#123) and Fix (#122) also improvement to (#71)

Implemented Client ID (incl. init and validation)
merger