FIX MERGE CONFLICT
Pull cariasa master , Improvements Reports