Merge pull request #32 from nordquant/contstraints