prepraro para el merge
Merge branch 'master' of https://github.com/gonzatorte/ClientCommunication
hotfix