Merge pull request #1 from nabulator/master

give me network
GUI
Merge pull request #2 from FJoe/master

Remerge the two