Added multigraph capabilities and fixed regex