Beautifying
Merge branch 'nsiv2' of github.com:jeroenh/AutoGOLE-Topologies into nsiv2