Updated cli to match latest npms
Merge