Bug on OR and ADD block fixed.

Jira-issue HUBHAC-7
Merge pull request #19 from dventura3/HUBHAC-7

Bug on OR and AND block fixed.