Issue #38. Condition check added