urgent error fix to be able to build
commit trolol
merge conflict solved
Merge pull request #123 from kofronpi/urgentFix

[NETWORK] urgent error fix to be able to build