hot fixes on graph
Merge branch 'dev' of https://github.com/andresob/flow into dev