Feature: Added CLI options

@vs-ab @jtsoi  could you take a look please