Merge pull request #4 from yssamarie/master

Modified solver and ui
Modified ui and solver