Merge pull request #213 from cgeoffroy/pr/minimize_cli