Constraints fix.
Merge pull request #15 from chead/develop

Constraints fix.