Added commandline interface