Added command line version