Added command line arguments and file chooser