diff --git a/i42.crt b/i42.crt
deleted file mode 100644
index 23a439a6a13e4c3fad2cd33414df0d42c5299574..0000000000000000000000000000000000000000
--- a/i42.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC2TCCAkICCQC4yWRaTlsHGzANBgkqhkiG9w0BAQsFADCBsDELMAkGA1UEBhMC
-SFUxEDAOBgNVBAgMB0h1bmdhcnkxETAPBgNVBAcMCEJ1ZGFwZXN0MTkwNwYDVQQK
-DDBTY2jDg8K2bmhlcnogS29sbMODwqlnaXVtw4PCqXJ0IEFsYXDDg8KtdHbDg8Kh
-bnkxDTALBgNVBAsMBEtTWksxETAPBgNVBAMMCCouaTQyLmh1MR8wHQYJKoZIhvcN
-AQkBFhBlY2tsbUBzY2guYm1lLmh1MB4XDTE1MTIxMzE4MDEzOFoXDTE1MTIyMzE4
-MDEzOFowgbAxCzAJBgNVBAYTAkhVMRAwDgYDVQQIDAdIdW5nYXJ5MREwDwYDVQQH
-DAhCdWRhcGVzdDE5MDcGA1UECgwwU2Now4PCtm5oZXJ6IEtvbGzDg8KpZ2l1bcOD
-wqlydCBBbGFww4PCrXR2w4PCoW55MQ0wCwYDVQQLDARLU1pLMREwDwYDVQQDDAgq
-Lmk0Mi5odTEfMB0GCSqGSIb3DQEJARYQZWNrbG1Ac2NoLmJtZS5odTCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEA50OQk3PWaQd1qKUeds2f4k+AUT2JcqTgQzfD
-2McmlEZ43teVEaePlIL6SjewngiZ+56d1CWLrKTIxpoyoUwEdzPN+zFv8RAlVkVo
-Id8kRLimtILkWU+o+60YYisKRFB0U2Vewr0TYyoirUtvOqi7tUg/Re70xIx7Ahkg
-KimhPy8CAwEAATANBgkqhkiG9w0BAQsFAAOBgQBBRNdxh+4wBDxWZxvrUPXa1jmt
-xmbzSWUjEpQLUaTm4CZEBi9dX01f37JhbzClhNTpdBfCQrQOvNjzOGf2EAxVWSVk
-/Stx3TJHko9ccxjyGiKVQbFpG+og2el54ia643htTaPOhm+jwqvuRPaoQm7D7M2R
-ePMJwAewQvvzIGxG5A==
------END CERTIFICATE-----
diff --git a/update_i42_domain.py b/update_i42_domain.py
index f0ca31e17f808e24848b9067ebeff9d409be94f5..b17157671f9498f30627401ac180e54c93a28938 100755
--- a/update_i42_domain.py
+++ b/update_i42_domain.py
@@ -4,15 +4,29 @@
 from conf import *
 import urllib2
 import sys
+import argparse
 
 update_version = UPDATE_IP_VERSION
 # a parancssori paramĂŠter rugalmasabb, mint a config, ezĂŠrt felĂźlĂ­rhatja
-if len(sys.argv) > 1:
-	arg1 = int(sys.argv[1])
-	if arg1 in (4, 6):
-		update_version = arg1
-	else:
-		raise ValueError("Ilyen IP protokoll nincs. Adj meg jĂłt, vagy hagyd el az opciĂłt!")
+parser = argparse.ArgumentParser(
+		description="FrissĂ­tĂŠsi kĂŠrĂŠst indĂ­t a konfigurĂĄciĂłs fĂĄjlban megadott adatokkal "
+                    "az i42.hu alá eső regisztrált domain rekord(ok) frissítésére.")
+parser.add_argument("-4", "--ipv4_only", action="store_true",
+                    help="Csak IPv4-en prĂłbĂĄl meg frissĂ­tĂŠsi kĂŠrĂŠst kĂźldeni.")
+parser.add_argument("-6", "--ipv6_only", action="store_true",
+                    help="Csak IPv6-on prĂłbĂĄl meg frissĂ­tĂŠsi kĂŠrĂŠst kĂźldeni.")
+parser.add_argument("-v", "--validate", action="store_true",
+                    help="A megadott adatokkal validĂĄlĂĄsi kĂŠrĂŠst kĂźld. " +
+                         "Ez a kĂŠrĂŠs nem frissĂ­ti az ip cĂ­m(ek)et. " +
+                         "A vĂĄlaszbĂłl Ă­gy beĂĄllĂ­tĂĄskor tudhatĂł, hogy nincs-e valami elĂ­rva, " +
+                         "illetve minden rekord lĂŠtre van-e hozva.")
+
+args = parser.parse_args()
+
+if args.ipv4_only:
+	update_version = 4
+elif args.ipv6_only:
+	update_version = 6
 
 data_v4 = "token=%s&prefix=%s" % (MY_TOKEN, MY_PREFIX)
 data_v6 = data_v4
@@ -26,15 +40,19 @@ if len(MY_IP_V4) > 0:
 if len(MY_IP_V6) > 0:
 	data_v6 += "&ip_address=%s" % MY_IP_V6
 
+if args.validate:
+	data_v4 += "&validate"
+	data_v6 += "&validate"
+
 for (server, data, version) in [(server_v4, data_v4, 4), (server_v6, data_v6, 6)]:
 	try:
 		if (update_version in (4, 6)) and (update_version != version):
 			sys.stderr.write("IPv%d protokollon nem ment kĂŠrĂŠs.\n" % version)
 			continue
-		response = urllib2.urlopen(server, data=data, cafile="i42.crt", timeout=30)
+		response = urllib2.urlopen(server, data=data, timeout=30)
 		print response.read()
 	except urllib2.HTTPError, ex:
 		sys.stderr.write(str(ex))
 	except urllib2.URLError, ex:
-		sys.stderr.write("URLError: HibĂĄs URL cĂ­met adtĂĄl meg, vagy a kĂŠrĂŠs timeout-olt."
+		sys.stderr.write("URLError: HibĂĄs URL cĂ­met adtĂĄl meg, vagy a kĂŠrĂŠs timeout-olt. "
 		                 "Lehet, hogy IPv%d protokollon nem tudsz kommunikĂĄlni.\n" % version)