merge Network to IP
Merge pull request #171 from warmdawn/dev

merge Network to IP