diff --git a/pom.xml b/pom.xml
index 73bd47763444bfc1afaf7d4897ba980fbeab1baf..8d1353d924e27dc1a708717f1ab93310011e31e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,11 @@
             <artifactId>reflections</artifactId>
             <version>0.9.11</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.jopt-simple</groupId>
+            <artifactId>jopt-simple</artifactId>
+            <version>5.0.3</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java b/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java
index a9993e4ac63b665a52248d272a6e77d3e4caf1fa..ae3902f2c4a8e6f0be0b3b85af2b29f10282b59c 100644
--- a/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java
+++ b/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java
@@ -3,6 +3,12 @@ package com.fossgalaxy.games.fireworks;
 import com.fossgalaxy.games.fireworks.human.ui.UIPlayer;
 import com.fossgalaxy.games.fireworks.human.ui.pretty.HumanUIAgent;
 import com.fossgalaxy.games.fireworks.state.actions.Action;
+<<<<<<< HEAD
+=======
+import com.fossgalaxy.games.fireworks.utils.AgentUtils;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+>>>>>>> 9aaf132de70623e8adea5f7abf440cc42f8bed50
 
 
 import java.io.IOException;
@@ -17,8 +23,14 @@ import java.net.UnknownHostException;
 public class NetClient {
 
     public static void main(String[] args) {
+        OptionParser parser = new OptionParser();
+        parser.accepts("url").withOptionalArg().defaultsTo("localhost");
+
+        OptionSet options = parser.parse(args);
+
+
         try (
-            Socket socket = new Socket(args[0], NetServer.FIREWORKS_SERVER_PORT);
+        Socket socket = new Socket(options.valueOf("url").toString(), NetServer.FIREWORKS_SERVER_PORT);
         ) {
 
             UIPlayer player = new UIPlayer("human", new HumanUIAgent(), true);