Fixing setup files (not tested)
Generalize graph and some new example scripts
Merge pull request #301 from benjello/dev

Fix graph and setup