issue #229 final  commit

#229 @manareltayeb @SalahZalat @ranalabib @omarabdelfatah @mariowadiee @rehab-arafa  plz review