Added command line run option