Version 1.0 with command line options