Generating graph, fixed #54 fixed #55