fixes in networking
Merge pull request #98 from matiu/feature/ux6

Feature/ux6