diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 6065a29..e86d940 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -2,3 +2,4 @@ eclipse.preferences.version=1
 encoding//private/venv_py3_pyros/lib/python3.6/site-packages/celery/app/task.py=utf-8
 encoding//private/venv_py3_pyros/lib/python3.6/site-packages/celery/signals.py=utf-8
 encoding//private/venv_py3_pyros/lib/python3.6/site-packages/celery/task/base.py=utf-8
+encoding//src/utils/celme/setup.py=utf-8
diff --git a/README.md b/README.md
index 4d89d97..68d52b7 100644
--- a/README.md
+++ b/README.md
@@ -67,20 +67,19 @@ This software has been tested and validated with the following configurations :
 --------------------------------------------------------------------------------------------
 ## LAST VERSION
 
-Date: 10/10/18
+Date: 15/10/2018
 
 By: E. Pallier
 
-VERSION: 2018.0.011.0
+VERSION: 20181015.0.011.1 (bugfix)
 
-- NEW versionning plan : YYYY.M.mmm.b
-    - YYYY = Year
+- NEW versionning plan : YYYYMMDD.M.mmm.b
+    - YYYYMMDD = Day (UTC)
     - M = Major version number
     - mmm = Minor version number
     - b = Bugfix number
-- new devices_channel/ folder containing the new DeviceControllerAbstract and ClientChannelAbstract classes (independant from pyros for the moment, but will soon be integrated)
-- new src/utils/celme (celestial mecanics) library from Alain Klotz (more and more used inside pyros)
-- better README.md formatted file
+- Global Version number is now in src/__init__.py (idem for each pyros application) 
+- Bugfix tests
 
 --------------------------------------------------------------------------------------------
 - TECHNICAL DOC: tinyurl/pyros-colibri
@@ -100,8 +99,8 @@ VERSION: 2018.0.011.0
 Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
 
 **10/10/18 : Version 2018.0.011 (E. Pallier)**
-- NEW versionning plan : YYYY.M.mmm.b
-    - YYYY = Year
+- NEW versionning plan : YYYYMMDD.M.mmm.b
+    - YYYYMMDD = Day (UTC)
     - M = Major version number
     - mmm = Minor version number
     - b = Bugfix number
@@ -189,3 +188,21 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
 			https://projects.irap.omp.eu/versions/87
 
 04/04/16 	Installable version (install script)
+
+
+--------------------------------------------------------------------------------------------
+## TODO LIST (URGENT)
+
+DEMO:
+- SIMULATOR: 
+    - (AC) réserver cette page à un login superuser sinon n'importe qui pourra faire n'importe quoi à distance...
+    - 1) PLC : 
+        - ajouter boutons "START" et "STOP"
+        - implémenter weather et site OK/KO
+    - 2) TELE : implémenter "start" et "stop"
+    - 3) General : implement set to night/day
+
+
+
+
+
diff --git a/devices_channel/src_device/client/device_controller_abstract.py b/devices_channel/src_device/client/device_controller_abstract.py
index 6979977..b434eb8 100755
--- a/devices_channel/src_device/client/device_controller_abstract.py
+++ b/devices_channel/src_device/client/device_controller_abstract.py
@@ -80,8 +80,8 @@ abstract class DeviceControllerAbstract {
     class GenericResult
     --
     {abstract} connect_to_device()
-    {abstract} format_data_to_send()
-    {abstract} unformat_received_data()
+    {abstract} _format_data_to_send()
+    {abstract} _unformat_received_data()
     available_commands()
     execute()
     execute_generic_cmd()
diff --git a/src/__init__.py b/src/__init__.py
index e69de29..16fbf7a 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -0,0 +1,8 @@
+
+# S'inspirer de django.utils.version.py => get_version()
+#VERSION = (2, 0, 5, 'final', 0)
+#__version__ = get_version(VERSION)
+
+# See https://packaging.python.org/guides/single-sourcing-package-version
+
+__version__ = '20181015.0.011.1'
diff --git a/src/majordome/tests.py b/src/majordome/tests.py
index a3f79e9..866000f 100644
--- a/src/majordome/tests.py
+++ b/src/majordome/tests.py
@@ -113,6 +113,9 @@ class MajordomeTests(TestCase):
         print("hello3")
         time.sleep(5)
         print("hello4")
+
+        # (EP) !!! VERY IMPORTANT, because otherwise the other tests won't pass as they are expecting to run from src/ !!!        
+        os.chdir('..')
         
         self.tearDown()
         #thread_majordome.join()
diff --git a/src/routine_manager/tests.py b/src/routine_manager/tests.py
index 34b44e4..809ccd2 100644
--- a/src/routine_manager/tests.py
+++ b/src/routine_manager/tests.py
@@ -6,9 +6,11 @@ SAVED_REQUESTS_FOLDER = "misc/saved_requests/"
 
 class TestRoutineManager(TestCase):
 
-    fixtures = ["tests/routine_mgr_test.json"]
+    fixtures = ['tests/routine_mgr_test.json']
+
 
     def setUp(self):
+        #print("Routine Manager test")
         pass
 
     def test_import_fake_file(self):
diff --git a/src/scheduler/tests.py b/src/scheduler/tests.py
index e4cee04..ce338af 100644
--- a/src/scheduler/tests.py
+++ b/src/scheduler/tests.py
@@ -3,6 +3,8 @@ from scheduler.Scheduler import Scheduler
 from common.models import *
 from scheduler.simulator import Simulator
 
+import os
+
 SIMULATION_FILE = 'file:./scheduler/sequences_cador.html'
 
 
@@ -662,4 +664,5 @@ class SchedulerTest(TestCase):
         print("\n===== TEST_SIMULATION =====\n")
 
         simulator = Simulator()
+        print("current dir is", os.getcwd())
         simulator.simulate(SIMULATION_FILE)
--
libgit2 0.21.2