Merge pull request #294 from jlaura/network

Issue 291 Tentative Fix
Merge pull request #296 from jlaura/network

wed fix