Creating optigraph branch with new commits.
Including merge fixes from Kevin and adding benchmark scripts.
Merge branch 'optigraph' into wip-release