Merge pull request #27 from niode/nathan

Added Constraints.
Constraints compile. Removed orSearch (sorry).