issue # 81 , like comments 

issue #83 
please review
@marwa-mehanna 
@mahmoudhashish 
@mohammad-abdulkhaliq