bugs solved, communication seems to work properly TODO: TEST IT
Merge branch 'master' into task-2-k