Merge pull request #26 from InCNTRE/master

flow_matches