Added command line arguments
Merged