Merge pull request #504 from zeroadam/feature/Network