Merge pull request #136 from stevenvanrossem/master

cleanup monitoring and networking functions for opensourcing