Fixing Loop
Merge branch 'feature/no_graph' into feature/no_graph-cmake