Companion commit to PR #282
Merge pull request #47 from authmillenon/net_module_refactor

Companion commit to PR #282