Added cli
Fixed cli parsing
Initial commit