diff --git a/Python/CCcamTester.py b/Python/CCcamTester.py
index dc9c2b5..9b69984 100644
--- a/Python/CCcamTester.py
+++ b/Python/CCcamTester.py
@@ -99,7 +99,6 @@ def DoHanshake(socket):
 
     random = bytearray(16)
     socket.recv_into(random, 16) #Receive first 16 "Hello" random bytes
-    print "Hello bytes: " + random
 
     random = CriptoBlock.Xor(random); #Do a Xor with "CCcam" string to the hello bytes
 
diff --git a/Python/Main.py b/Python/Main.py
deleted file mode 100644
index 9851a39..0000000
--- a/Python/Main.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- 
-#Created by Dagger -- https://github.com/gavazquez
-
-if __name__ == "__main__":
-    import CCcamTester
-    CCcamTester.TestCline("C: jjjjj.jjjj.com 22000 uuuu pppp")
diff --git a/Python/Makefile b/Python/Makefile
new file mode 100644
index 0000000..5107610
--- /dev/null
+++ b/Python/Makefile
@@ -0,0 +1,18 @@
+all: pack
+
+pack:
+	zip --quiet CCcamTester ./*.py
+	zip --quiet --junk-paths CCcamTester ./__main__.py
+	echo '#!/usr/bin/env python' > CCcamTester
+	cat CCcamTester.zip >> CCcamTester
+	rm CCcamTester.zip
+	chmod a+x CCcamTester
+
+clean:
+	rm -f CCcamTester
+
+install:
+	cp CCcamTester /usr/local/bin/
+
+uninstall:
+	rm -f /usr/local/bin/CCcamTester
\ No newline at end of file
diff --git a/Python/__main__.py b/Python/__main__.py
new file mode 100644
index 0000000..15b2542
--- /dev/null
+++ b/Python/__main__.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- 
+#Created by Dagger -- https://github.com/gavazquez
+
+if __name__ == "__main__":
+    import CCcamTester
+    import sys
+
+    if len(sys.argv) == 5:
+        CCcamTester.TestCline("C: "+sys.argv[1]+" "+sys.argv[2]+" "+sys.argv[3]+" "+sys.argv[4])
+    else:
+    	print "Wrong format. Try '"+sys.argv[0]+" SERVER PORT USER PASSWORD'"