solver work
Merge remote-tracking branch 'origin/master'
Integer error fix
Merge remote-tracking branch 'origin/master'