Improved output of CLI and updated Readme.