Merge pull request #91 from alaashafaee/C2_magdi_add_info

C2 magdi add info
fixing bugs
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into C2_magdi_add_info