Merging changes to GP2Graph
Merge resolved