Added --username and --password command line options