Pull Request C3_youssefattaby_Map#6

Issue #64 
@yomn-el-mistikawy  @hanamagdy  @mozdan-hamd  @amrgamal18 @Ziad-abdelkader