Merge pull request #29 from jpmontez/master

Separate networking variables