Added commandline version.