Changes according PR #282
Merge pull request #39 from authmillenon/refactor_net_module

Changes according PR #282