forked from: Graph 1.6

