Found some bugs in code, tried to fix them, have list of problems but can fix now
Merge branch 'master' into Zoher
Merge branch 'Zoher'