Merge pull request #385 from effy/master

Refactoring of Network Graph classes