Feature: Added CLI options

@vs-ab @jtsoi  could you take a look please 
One indentation too much, will Python run this?