Feature/lpsolve

should be reverted