Beginning of fixing Networking issues.
Merge pull request #1 from mangosvb/master

Beginning of fixing Networking issues.