Two small fixes in constraint generation
Merge pull request #36 from jeroenk/constraint-fix

Two small fixes in constraint generation
Merge branch 'master' into gpu