Added better version of logic operators counting.
Merge branch 'logic_ops_finding' into develop