CLI change to support Mac and .gitignore