2nd commit
Merge https://github.com/immersinn/Network-Stuff