T4 omarsherif 4.5

Issue #125 
@aaeabdo  @Zaatar  @karim-elbawab @MennatallahElKharbotly