diff --git a/libs/esl/python/single_command.py b/libs/esl/python/single_command.py
index 977ec9660d..4f1f0ea59a 100644
--- a/libs/esl/python/single_command.py
+++ b/libs/esl/python/single_command.py
@@ -2,21 +2,42 @@
 
 import string
 import sys
+from optparse import OptionParser
 from ESL import *
 
-con = ESLconnection("localhost","8021","ClueCon")
-#are we connected?
+def main(argv):
+	
+	try:
+	   
+		parser = OptionParser()
+		parser.add_option("-a", "--auth", dest="auth", default="ClueCon",
+								help="ESL password")
+		parser.add_option("-s", "--server", dest="server", default="127.0.0.1",
+								help="FreeSWITCH server IP address")
+		parser.add_option("-p", "--port", dest="port", default="8021",
+								help="FreeSWITCH server event socket port")
+		parser.add_option("-c", "--command", dest="command",
+								help="command to run, surround mutli word commands in \"\'s")
 
-if con.connected:
+		(options, args) = parser.parse_args()
 
-	#get argument passed to script
-	command = string.join(sys.argv[1:])
+			
+		con = ESLconnection(options.server, options.port, options.auth)
+	#are we connected?
 
-	#run command
-	e=con.sendRecv("api "+  command)
-	print e.getBody()
+		if con.connected:
+			#run command
+			e=con.sendRecv("api "+  options.command)
+			print e.getBody()
 
-else:
+		else:
 
-	print "Not Connected"
+			print "Not Connected"
+			sys.exit(2)
 
+	except:
+		
+		print parser.get_usage()
+		
+if __name__ == "__main__":
+    main(sys.argv[1:])
\ No newline at end of file