changes from build
Merge pull request #1 from Caroisawesome/toggleable_constraints

changes from build