5.7 jihan

Issue #87  @eldesouky @ZzimBoo91 @attwa  @omartarek  @abdelrahmansakr