Fixed zi flows. Added zi tags
Merge remote-tracking branch 'origin/master'