Fixes for constraint creation
Merge pull request #94 from aheuermann/constraint_fixes

Fixes for constraint creation