fixing bug
Merge branch 'solver-v1.2'
Merge branch 'master' into solver-v1.3