Fix logic bug
Merge pull request #13 from ylando2/master

Refactoring to conversion to disjunctive normal form from ylando2.