Fixed bug in 15 node network.
Merge remote-tracking branch 'upstream/master'