Adding CLI options

#2