Code made Compilable
Merge branch 'command/Victor'