Updated to CLI 2.0
Merge pull request #1 from vania-pooh/master

Updated to CLI 2.0