refactoring
added buggy flowmanager
fixed segfault
Merge branch 'develop'