Commands fix
Report command fix
Merge branch 'report'