merge solve
Merge branch 'master' of https://github.com/yassin-gamal/iWhim
bugs fixing