Merge pull request #12 from ylando2/master

Merge a few minor fixes
Merge pull request #13 from ylando2/master

Refactoring to conversion to disjunctive normal form from ylando2.