Added new option parser and test
Added new arguments parser
Merge branch 'new_branch_name'