Merge pull request #8 from sandro-pedrett/dev_Michael

Dev michael
- bugfix disconnection client
Merge pull request #9 from sandro-pedrett/dev_sandro

Dev sandro
Merge pull request #10 from sandro-pedrett/master

bugfix client disconnected