Fix integration with networking layer
Merge pull request #22 from nirs/master

Fix integration with networking layer