Merge pull request #1586 from Areloch/NetSimNetGraph