enhanced graph
Merge pull request #65 from alexanderson/master

enhanced graph
fixed graph bug
Merge pull request #66 from alexanderson/master

fixed graph bug