Add build_graph function to util.py
Use util.py for graph building
Fix typo in file name
Fix bug introduced by refactoring
Bug fixes and extensions to util.py
Merge branch 'master' into report