Fixed reverted parsing command line arguments!