Fixed CLI
Merged changed to cli