diff --git a/src/main.rs b/src/main.rs
index 1568944..aecbb7f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -233,12 +233,22 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .takes_value(true)
                 .help("Configuration file"),
         )
+        .arg(
+            Arg::with_name("random-world")
+                .long("random-world")
+                .takes_value(false)
+                .help("Generate random world"),
+        )
         .get_matches();
 
     let raw_conf = open_file(matches.value_of("file").unwrap_or("two_robots.txt"))?;
 
     let mut robot_pool: Vec<robot::Robot> = Vec::new();
-    let world: world::World = parse_config(raw_conf, &mut robot_pool)?;
+    let world: world::World = match matches.value_of("random-world") {
+        None => parse_config(raw_conf, &mut robot_pool)?,
+        Some(_) => world::random_world(),
+    };
+
     let mut hash: HashMap<robot::Position, u32> = HashMap::new();
     create_hash_map(&robot_pool, &mut hash);
     println!("World {{ x_max = {}; y_max = {} }}", world.x, world.y);