Initial parsing of cmd arguments
Merged branches