API minor changes commit before integrating cytoscape
Fixing conflicts