Fixed comments and removed zip_original.
Fix issues with shift operator.
Merge remote-tracking branch 'origin/development' into quantifier
Fixed dummy variable being seen as dependencies