improved constrained optimization in maximization step
Merge branch 'dev'
Merge branch 'dev'
made constraint more efficient