Refactorisation
fix refactorisation mess
Merge branch 'release/0.0'
Merge branch 'master' of github.com:nicolasramy/flow