Add command line argument processing
merge