diff --git a/FtpCsvReceiver.py b/FtpCsvReceiver.py
old mode 100644
new mode 100755
index d6efb7f..76d51e7
--- a/FtpCsvReceiver.py
+++ b/FtpCsvReceiver.py
@@ -20,45 +20,44 @@ from pyftpdlib.servers import FTPServer
 from pyftpdlib.authorizers import UnixAuthorizer
 from pyftpdlib.filesystems import UnixFilesystem
 
-config = {}
 
+class config():
+    def __init__(self):
+        c = ConfigParser()
+        c.read([
+            "/etc/ase/ftpcsvreceiver.ini",
+            "./ftpcsvreceiver.ini"
+        ])
 
-def read_config():
-    c = ConfigParser()
-    c.read([
-        "/etc/ase/ftpcsvreceiver.ini",
-        "./ftpcsvreceiver.ini"
-    ])
+        self.firstport = c.getint("ftpserver", "firstport")
+        self.logfilename = c.get("ftpserver", "logfilename")
+        self.proxyaddr = c.get("ftpserver", "proxyaddr")
 
-    config["firstport"] = c.getint("ftpserver", "firstport")
-    config["logfilename"] = c.get("ftpserver", "logfilename")
-    config["proxyaddr"] = c.get("ftpserver", "proxyaddr")
+        self.smtphost = c.get("mailserver", "hostname")
+        self.smtpport = c.getint("mailserver", "port")
+        self.sender = c.get("mailserver", "sender")
+        self.password = c.get("mailserver", "password")
+        self.receivers = c.get("mailserver", "receivers")
+        self.message = c.get("mailserver", "message")
+        self.subject = c.get("mailserver", "subject")
+        self.debuglevel = c.getint("mailserver", "debug")
 
-    config["smtphost"] = c.get("mailserver", "hostname")
-    config["smtpport"] = c.getint("mailserver", "port")
-    config["sender"] = c.get("mailserver", "sender")
-    config["password"] = c.get("mailserver", "password")
-    config["receivers"] = c.get("mailserver", "receivers")
-    config["message"] = c.get("mailserver", "message")
-    config["subject"] = c.get("mailserver", "subject")
-    config["debuglevel"] = c.getint("mailserver", "debug")
+        self.mqhost = c.get("mqserver", "hostname")
+        self.mquser = c.get("mqserver", "user")
+        self.mqpass = c.get("mqserver", "password")
 
-    config["mqhost"] = c.get("mqserver", "hostname")
-    config["mquser"] = c.get("mqserver", "user")
-    config["mqpass"] = c.get("mqserver", "password")
-
-    config["csvfs"] = c.get("csvfs", "path")
+        self.csvfs = c.get("csvfs", "path")
     
-def send_mail(sev, msg):
-    msg = MIMEText(config["message"] + "\n" + msg)
-    msg["Subject"] = config["subject"] + " " + sev
-    msg["From"] = config["sender"]
-    msg["To"] = config["receivers"]
-    conn = SMTP(host=config["smtphost"], port=config["smtpport"], local_hostname=None, timeout=5, source_address=None )
-    conn.set_debuglevel(config["debuglevel"])
+def send_mail(sev, msg, cfg):
+    msg = MIMEText(cfg.message + "\n" + msg)
+    msg["Subject"] = cfg.subject + " " + sev
+    msg["From"] = cfg.sender
+    msg["To"] = cfg.receivers
+    conn = SMTP(host=cfg.smtphost, port=cfg.smtpport, local_hostname=None, timeout=5, source_address=None )
+    conn.set_debuglevel(cfg.debuglevel)
     try:
-        conn.login(config["sender"], config["password"])
-        conn.sendmail(config["sender"], config["receivers"], msg.as_string())
+        conn.login(cfg.sender, cfg.password)
+        conn.sendmail(cfg.sender, cfg.receivers, msg.as_string())
     except SMTPAuthenticationError:
         logging.error("PID {:>5} >> Mail failed: {}.".format(
             os.getpid(), "SMTP authentication error"))
@@ -69,9 +68,9 @@ def send_mail(sev, msg):
         conn.quit()
 
 
-def write_queue(msg):
-    parameters = pika.URLParameters('amqp://' + config["mquser"] + ':' +
-                                    config["mqpass"] + '@' + config["mqhost"] +
+def write_queue(msg, cfg):
+    parameters = pika.URLParameters('amqp://' + cfg.mquser + ':' +
+                                    cfg.mqpass + '@' + cfg.mqhost +
                                     ':5672/%2F')
     connection = pika.BlockingConnection(parameters)
     channel = connection.channel()
@@ -90,6 +89,7 @@ def write_queue(msg):
 
 class ASEHandler(FTPHandler):
     def on_file_received(self, file):
+        cfg = self.cfg
         path, filenameExt = os.path.split(file)
         filename, fileExtension = os.path.splitext(filenameExt)
 
@@ -141,7 +141,7 @@ class ASEHandler(FTPHandler):
             df.dateFmt(fileDate),
             fileTime,
         ))
-        newPath = config["csvfs"] + self.username + "/received/" + unitName.upper(
+        newPath = cfg.csvfs + self.username + "/received/" + unitName.upper(
         ) + "/"
         newFilename = (newPath + filename + "_" +
                        str(ts.timestamp("tms") + fileExtension))
@@ -160,7 +160,7 @@ class ASEHandler(FTPHandler):
             logging.error("PID {:>5} >> Error to move {} into {}.".format(
                 os.getpid(), filenameExt, newFilename))
         #    send_mail("Error",
-        #              "OS error move " + filenameExt + " to " + newFilename)
+        #              "OS error move " + filenameExt + " to " + newFilename, cfg)
 
 
         mq_message = "{};{};{};{};{};{};{}".format(
@@ -172,7 +172,7 @@ class ASEHandler(FTPHandler):
             fileTime,
             newFilename,
         )
-        write_queue(mq_message)
+        write_queue(mq_message, cfg)
         logging.info("PID {:>5} >> queue message: {}.".format(
                 os.getpid(), mq_message))
 
@@ -182,20 +182,21 @@ class ASEHandler(FTPHandler):
 
 
 def main():
-    read_config()
+    cfg = config()
     try:
         authorizer = UnixAuthorizer(rejected_users=["root"],
                                     require_valid_shell=True)
         handler = ASEHandler
+        handler.cfg = cfg
         handler.authorizer = authorizer
         handler.abstracted_fs = UnixFilesystem
-        handler.masquerade_address = config["proxyaddr"]
-        _range = list(range(config["firstport"], config["firstport"] + 20))
+        handler.masquerade_address = cfg.proxyaddr
+        _range = list(range(cfg.firstport, cfg.firstport + 20))
         handler.passive_ports = _range
 
         logging.basicConfig(
             format="%(asctime)s %(message)s",
-            filename="/var/log/" + config["logfilename"],
+            filename="/var/log/" + cfg.logfilename,
             level=logging.INFO,
         )