Updated lpsolve branch