Added command line arguments handling.
Merge.
Added command line arguments handling.