diff --git a/ip2e-config.py b/ip2e-config.py
index f80f2e8..0209f72 100755
--- a/ip2e-config.py
+++ b/ip2e-config.py
@@ -5,7 +5,7 @@
 # ip2e (IP to email) - Create the configuration file.          |
 # Created by clamsawd (clamsawd@openmailbox.org)               |
 # Licensed by GPL v.3                                          |
-# Last update: 06-11-2015                                      |
+# Last update: 09-11-2015                                      |
 #                                                              |
 # Compatible with Python 3.x                                   |
 # --------------------------------------------------------------
@@ -47,7 +47,7 @@ if not os.path.exists(".ip2e"):
 if os.path.exists(".ip2e"):
 	os.chdir(".ip2e")
 
-if os.path.isfile("ip2e-conf.py"):
+if os.path.isfile("ip2e.conf"):
 	ClearScreen()
 	print ("")
 	print ("ip2e-config v"+version)
@@ -62,7 +62,7 @@ if os.path.isfile("ip2e-conf.py"):
 	if OverWriteOrCheck == "o" or OverWriteOrCheck == "O":
 		print ("Create new configuration")
 	else:
-		exec(open("ip2e-conf.py").read())
+		exec(open("ip2e.conf").read())
 		#Import smtplib
 		import smtplib
 		try:
@@ -81,7 +81,7 @@ if os.path.isfile("ip2e-conf.py"):
 			print ("")
 		exit(0)
 
-#Set variables of 'ip2e-conf.py'
+#Set variables of 'ip2e.conf'
 ClearScreen()
 print ("")
 print ("ip2e-config v"+version+" - Create config.file")
@@ -92,12 +92,12 @@ FromEmailPass=input("Type the pass of email sender: ")
 SmtpFromEmail=input("Type the server STMP of email sender: ")
 ToEmail=input("Type the email receiver: ")
 
-#Create 'ip2e-conf.py'
-if os.path.isfile("ip2e-conf.py"):
-	os.remove("ip2e-conf.py")
-ip2ecf=open('ip2e-conf.py','w')
+#Create 'ip2e.conf'
+if os.path.isfile("ip2e.conf"):
+	os.remove("ip2e.conf")
+ip2ecf=open('ip2e.conf','w')
 ip2ecf.close()
-ip2ecf=open('ip2e-conf.py','a')
+ip2ecf=open('ip2e.conf','a')
 ip2ecf.write('# sample configuration file of ip2e\n')
 ip2ecf.write('\n')
 ip2ecf.write('FromEmail="'+FromEmail+'"\n')
@@ -112,7 +112,7 @@ ClearScreen()
 print ("")
 print ("ip2e-config v"+version+" - Current config.file")
 print ("")
-readfile=open('ip2e-conf.py', 'r')
+readfile=open('ip2e.conf', 'r')
 print(readfile.read())
 readfile.close()
 
@@ -123,7 +123,7 @@ if TestConnection == "n":
 	print ("Exiting...")
 	exit(0)
 else:
-	exec(open("ip2e-conf.py").read())
+	exec(open("ip2e.conf").read())
 	#Import smtplib
 	import smtplib
 	try:
diff --git a/ip2e-daemon.py b/ip2e-daemon.py
index 26e2d01..1870c0f 100755
--- a/ip2e-daemon.py
+++ b/ip2e-daemon.py
@@ -51,9 +51,9 @@ if not os.path.exists(".ip2e"):
 if os.path.exists(".ip2e"):
 	os.chdir(".ip2e")
 
-#Check if exists 'ip2e-conf.py'
-if os.path.isfile("ip2e-conf.py"):
-	print ("ip2e-conf.py exists")
+#Check if exists 'ip2e.conf'
+if os.path.isfile("ip2e.conf"):
+	print ("ip2e.conf exists")
 else:
 	ClearScreen()
 	print ("")
@@ -63,19 +63,19 @@ else:
 	print ("")
 	exit(0)
 
-#Check if exists 'current-ip.py'
-if os.path.isfile("current-ip.py"):
-	print ("current-ip.py exists")
+#Check if exists 'IP.log'
+if os.path.isfile("IP.log"):
+	print ("IP.log exists")
 else:
-	print ("current-ip.py created")
-	ip2eIPcf=open('current-ip.py','w')
+	print ("IP.log created")
+	ip2eIPcf=open('IP.log','w')
 	ip2eIPcf.close()
-	ip2eIPcf=open('current-ip.py','a')
-	ip2eIPcf.write('CurrentIP="0.0.0.0"\n')
+	ip2eIPcf=open('IP.log','a')
+	ip2eIPcf.write('0.0.0.0')
 	ip2eIPcf.close()
 
-#Import variables from ip2e-conf.py
-exec(open("ip2e-conf.py").read())
+#Import variables from ip2e.conf
+exec(open("ip2e.conf").read())
 
 #Import native OS color scheme
 try:
@@ -149,7 +149,10 @@ while PublicIP <= 2:
 			editlog.write("[ip2e-daemon] ["+CurrentTime+"] Error getting IP\n")
 			editlog.write("[ip2e-daemon] ["+CurrentTime+"] Retrying in 10 seconds...\n")
 			time.sleep(10)
-	exec(open("current-ip.py").read())
+	readfileIP=open('IP.log', 'r')
+	CurrentIPRaw=readfileIP.read()
+	CurrentIP=CurrentIPRaw.strip()
+	readfileIP.close()
 	if CurrentIP == NewIP:
 		CurrentTime = time.strftime("%H:%M")
 		GreenColor()
@@ -195,11 +198,11 @@ while PublicIP <= 2:
 				editlog.write(MailMessage+" ("+ToEmail+")\n")
 				editlog.write("[ip2e-daemon] ["+CurrentTime+"] Retrying in 10 seconds...\n")
 				time.sleep(10)
-		os.remove("current-ip.py")
-		ip2eIPcf=open('current-ip.py','w')
+		os.remove("IP.log")
+		ip2eIPcf=open('IP.log','w')
 		ip2eIPcf.close()
-		ip2eIPcf=open('current-ip.py','a')
-		ip2eIPcf.write('CurrentIP="'+NewIP+'"\n')
+		ip2eIPcf=open('IP.log','a')
+		ip2eIPcf.write(NewIP)
 		ip2eIPcf.close()
 	CurrentTime = time.strftime("%H:%M")
 	GreenColor()