Minor fix
Minor fix2
Added CLI argument parsing