Merged with origin/development. Fized small problems in graph builder.