diff --git a/app/build.gradle b/app/build.gradle
index 9d45c7bad7312f02d3cf02d08b1165e99384f36c..033895ed40b7a6cc9ed6ef9bccd12958fff9dfc6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 def versionMajor = 1
 def versionMinor = 2
-def versionPatch = 0
+def versionPatch = 1
 
 
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9bbbf1bb012f97f4d31b57f4935f8324152b07c9..41f9436cbc3412da861b3e2936a784926480192a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -94,7 +94,6 @@
             android:name=".services.ObserverService"
             android:enabled="true" />
         <service android:name=".services.SynchronizationService" />
-
         <receiver
             android:name=".receivers.BootCompletedReceiver"
             android:enabled="true"
diff --git a/app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java b/app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java
index e981cac0480c3c0ce71d11e5ff74a94e5a5f0ecc..24191867fb31b811c041c536487e79486ee99be7 100644
--- a/app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java
+++ b/app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java
@@ -42,24 +42,64 @@ public class FileEventListener  {
     }
 
     public void onEvent(int event, File file) {
-        if (event == FileObserver.DELETE) {
-            if (file.isDirectory()) {
-                handleDirectoryDelete(file);
-            } else {
-                handleFileDelete(file);
-            }
-        } else if (event == FileObserver.CLOSE_WRITE) {
+        if (file.isHidden()) return;
 
-            if (file.isDirectory()) {
-                handleDirectoryCloseWrite(file);
-            } else {
+        if (file.isDirectory()) {
+            handleDirectoryEvent(event, file);
+        } else {
+            handleFileEvent(event, file);
+        }
+    }
+
+    /**
+     * Handle some file event for a file which is not a directory
+     * @param event the event mask. CLOSE_WRITE, DELETE & MOVE_SELF are handled
+     * @param file the file concerned by the event
+     */
+    private void handleFileEvent(int event, File file) {
+        switch(event) {
+            case FileObserver.CLOSE_WRITE: //todo it is called two times per file except if screenshot by example or take a picture
                 handleFileCloseWrite(file);
-            }
-        } else if (event == FileObserver.MOVE_SELF){
-            Log.d(TAG, file.getAbsolutePath() + " has been moved. Not handled yet");
+                break;
+            case FileObserver.DELETE:
+                handleFileDelete(file);
+                break;
+            case FileObserver.MOVE_SELF: //todo to be able to catch that, we probably need a buffer to catch a succession (MOVE_FROM, MOVE_TO, then MOVE_SELF).
+                Log.d(TAG, file.getAbsolutePath() + " has been moved. Not handled yet");
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Handle FileEvent for a directory
+     * @param event FileEvent mask. CREATE, CLOSE_WRITE, DELETE, MOVE_SELF
+     * @param dir directory concerned by file event
+     */
+    private void handleDirectoryEvent(int event, File dir) {
+        switch(event) {
+            case FileObserver.CREATE:
+                handleDirectoryCreate(dir);
+                break;
+            case FileObserver.CLOSE_WRITE:
+                handleDirectoryCloseWrite(dir);
+                break;
+            case FileObserver.DELETE: //todo #1 Fix: never used. when done on a dir, it triggers handleFileEvent. Why ?!
+                handleDirectoryDelete(dir);
+                break;
+            case FileObserver.MOVE_SELF:
+                Log.d(TAG, dir.getAbsolutePath() + " has been moved. Not handled yet");
+                break;
+            default:
+                break;
         }
     }
 
+    /**
+     * Send syncRequest to SynchronizationService
+     * @param request
+     */
     private void sendSyncRequestToSynchronizationService(SyncRequest request) {
         Log.d(TAG, "Sending a SyncRequest for " + request.getSyncedFileState().getName());
         if (serviceConnection.isBoundToSynchronizationService()) {
@@ -70,23 +110,42 @@ public class FileEventListener  {
         }
     }
 
+    /**
+     * When a new directory is detected, it must be inserted in database
+     * if it's parent directory is already in the database
+     * @param directory
+     */
+    private void handleDirectoryCreate(File directory) {
+        Log.d(TAG, "handleDirectoryCreate(" + directory.getAbsolutePath() + ")");
+        final String parentPath = CommonUtils.getLocalPath(directory.getParentFile());
+        final SyncedFolder parentFolder = DbHelper.getSyncedFolderByLocalPath(parentPath, appContext);
+        if (parentFolder != null) {
+            final SyncedFolder folder = new SyncedFolder(parentFolder, directory.getName() + FileUtils.PATH_SEPARATOR, directory.lastModified(), "");
+            DbHelper.insertSyncedFolder(folder, appContext);
+        }
+    }
+
+    /**
+     * Handle CLOSE_WRITE event for a directory
+     * todo: check in which condition a directory can generate a close_write
+     * @param directory
+     */
     private void handleDirectoryCloseWrite(File directory) {
         final String fileLocalPath = CommonUtils.getLocalPath(directory);
         Log.d(TAG, "handleDirectoryCloseWrite(" + fileLocalPath + ")");
-        SyncedFolder folder = DbHelper.getSyncedFolderByLocalPath(fileLocalPath, appContext);
-        if (folder == null) { //it's a directory creation
-            final String parentPath = CommonUtils.getLocalPath(directory.getParentFile());
-            SyncedFolder parentFolder = DbHelper.getSyncedFolderByLocalPath(parentPath, appContext);
-            if (parentFolder != null) { //if parent is in the DB
-                folder = new SyncedFolder(parentFolder, directory.getName() + FileUtils.PATH_SEPARATOR, directory.lastModified(), "");
-                DbHelper.insertSyncedFolder(folder, appContext);
-            }
+        final SyncedFolder folder = DbHelper.getSyncedFolderByLocalPath(fileLocalPath, appContext);
+        if (folder == null) {
+            handleDirectoryCreate(directory); //todo check if really relevant
         } else {  //It's a directory update
             folder.setLastModified(directory.lastModified());
             DbHelper.updateSyncedFolder(folder, appContext);
         }
     }
 
+    /**
+     * Handle a file deletion event for a directory
+     * @param directory
+     */
     private void handleDirectoryDelete(File directory) {
         final String fileLocalPath = CommonUtils.getLocalPath(directory);
         Log.d(TAG, "handleDirectoryDelete("+fileLocalPath+")");
@@ -94,20 +153,23 @@ public class FileEventListener  {
         if (folder == null) {
             //look for parent
             final String parentPath = CommonUtils.getLocalPath(directory.getParentFile());
-            SyncedFolder parentFolder = DbHelper.getSyncedFolderByLocalPath(parentPath, appContext);
-            if (parentFolder != null ) { //if parent is in the DB
-                folder = new SyncedFolder(parentFolder, directory.getName()+ FileUtils.PATH_SEPARATOR, directory.lastModified(), "");
-                folder.setEnabled(false);
-                DbHelper.insertSyncedFolder(folder, appContext);
-            }
-        } else {  //If already in DB
-            if (folder.isEnabled()) {
-                folder.setEnabled(false);
-                DbHelper.updateSyncedFolder(folder, appContext);
+            final SyncedFolder parentFolder = DbHelper.getSyncedFolderByLocalPath(parentPath, appContext);
+            if (parentFolder == null ) { //if parent is not in the DB
+                return;
             }
+            folder = new SyncedFolder(parentFolder, directory.getName()+ FileUtils.PATH_SEPARATOR, directory.lastModified(), "");
+            folder.setEnabled(false);
+            DbHelper.insertSyncedFolder(folder, appContext);
+        } else if (folder.isEnabled()) {
+            folder.setEnabled(false);
+            DbHelper.updateSyncedFolder(folder, appContext);
         }
     }
 
+    /**
+     * handle a file close_write event for a file which is not a directory
+     * @param file
+     */
     private void handleFileCloseWrite(File file) {
         final String fileLocalPath = CommonUtils.getLocalPath(file);
         Log.d(TAG, "handleFileCloseWrite("+fileLocalPath+")");
@@ -146,13 +208,16 @@ public class FileEventListener  {
         }
     }
 
+    /**
+     * Handle a file deletion event for a file which is not a directory
+     * @param file
+     */
     private void handleFileDelete(File file) {
         final String fileLocalPath = CommonUtils.getLocalPath(file);
         Log.d(TAG, "handleFileDelete("+fileLocalPath+")");
-        SyncedFileState fileState = DbHelper.loadSyncedFile( appContext, fileLocalPath, true);
+        final SyncedFileState fileState = DbHelper.loadSyncedFile( appContext, fileLocalPath, true);
         if (fileState == null) {
-            Log.d(TAG, "Ignore event because file is not already in database");
-            return;
+            return; //Todo #1: should we call handleDirectoryDelete before to return ?
         }
 
         //If already in DB
@@ -163,14 +228,13 @@ public class FileEventListener  {
     }
 
     public void unbindFromSynchronizationService(){
-        if(serviceConnection.isBoundToSynchronizationService())
+        if (serviceConnection.isBoundToSynchronizationService())
             appContext.unbindService(serviceConnection);
         else
             Log.w(TAG, "Not bound to SynchronizationService: can't unbind.");
     }
 
     public void bindToSynchronizationService(){
-        Log.d(TAG, "bindToSynchronizationService()");
         final Intent SynchronizationServiceIntent = new Intent(appContext, SynchronizationService.class);
         appContext.bindService(SynchronizationServiceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
     }
diff --git a/app/src/main/java/foundation/e/drive/database/DbHelper.java b/app/src/main/java/foundation/e/drive/database/DbHelper.java
index ca30b84fdc8cf1a8addbbce814b704b785dcd79f..77a584215841ca7b7989086be17cfbbb4f34ca0e 100644
--- a/app/src/main/java/foundation/e/drive/database/DbHelper.java
+++ b/app/src/main/java/foundation/e/drive/database/DbHelper.java
@@ -11,6 +11,7 @@ package foundation.e.drive.database;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
@@ -324,4 +325,15 @@ public final class DbHelper extends SQLiteOpenHelper {
         }
         Log.e(TAG,"Failed to dump Database");
     }
+
+    /**
+     * Remove syncedFileState for hidden file inserted in previous version
+     * @param context
+     * @throws SQLiteException if database can't be open
+     */
+    public static void removeHiddenSyncedFileState(Context context) throws SQLiteException {
+        SyncedFileStateDAO dao = openSyncedFileStateDAO(context, true);
+        dao.deleteHiddenFileState();
+        dao.close();
+    }
 }
diff --git a/app/src/main/java/foundation/e/drive/database/SyncedFileStateDAO.java b/app/src/main/java/foundation/e/drive/database/SyncedFileStateDAO.java
index 7cfa99a25740d6b3bf373ce79074857c01da3783..fffc4da0d4163e0f65060d3bcb0d4f81959e1318 100644
--- a/app/src/main/java/foundation/e/drive/database/SyncedFileStateDAO.java
+++ b/app/src/main/java/foundation/e/drive/database/SyncedFileStateDAO.java
@@ -102,6 +102,15 @@ class SyncedFileStateDAO {
                 + " = " + id, null);
     }
 
+
+    /**
+     * Remove SyncedFileState for hidden file (starting with '.')
+     * @return number of deleted input
+     */
+    public int deleteHiddenFileState() {
+        return mDB.delete(TABLE_NAME, FILE_NAME + " LIKE ?", new String[]{".%"});
+    }
+
     /**
      * Delete each syncedFileState which is bound to syncedFOlder with specified ID
      * @param folderId syncedFolder's id used as foreign key
diff --git a/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java b/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java
index ecb3b42ee845e3cc117133765d23dc601cdb6cbf..6ec31479f296a6e07ae353df6c0ea22f28e89169 100644
--- a/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java
+++ b/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java
@@ -12,8 +12,10 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteException;
 import android.util.Log;
 
+import foundation.e.drive.BuildConfig;
 import foundation.e.drive.database.DbHelper;
 import foundation.e.drive.services.InitializerService;
 import foundation.e.drive.utils.AppConstants;
@@ -24,13 +26,13 @@ import foundation.e.drive.utils.CommonUtils;
  */
 public class BootCompletedReceiver extends BroadcastReceiver {
     public static final String TAG = BootCompletedReceiver.class.getSimpleName();
-    public static final String DATE_SYSTEM_PROPERTY = "ro.build.date";
-
+    private static final String DATE_SYSTEM_PROPERTY = "ro.build.date";
+    private static final String PREF_VERSION_CODE = "VERSION_CODE";
     @Override
     public void onReceive(Context context, Intent intent) {
         final String action = intent.getAction();
         Log.i(TAG, "onReceive(...)");
-        SharedPreferences pref = context.getSharedPreferences(AppConstants.SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE);
+        final SharedPreferences pref = context.getSharedPreferences(AppConstants.SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE);
         if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
             if (!CommonUtils.getProp(DATE_SYSTEM_PROPERTY).equals(pref.getString(DATE_SYSTEM_PROPERTY, ""))) {
                 pref.edit().putString(DATE_SYSTEM_PROPERTY, CommonUtils.getProp(DATE_SYSTEM_PROPERTY)).apply();
@@ -38,9 +40,18 @@ public class BootCompletedReceiver extends BroadcastReceiver {
                 pref.edit().putBoolean(AppConstants.INITIALIZATION_HAS_BEEN_DONE, false).apply();
                 context.startService(new Intent(context, InitializerService.class));
 
-                DbHelper dbHelper = new DbHelper(context);
+                final DbHelper dbHelper = new DbHelper(context);
                 dbHelper.getWritableDatabase().close(); //Force upgrade of db.
             }
+            if (pref.getBoolean(AppConstants.INITIALIZATION_HAS_BEEN_DONE, false)
+                    && BuildConfig.VERSION_CODE > pref.getInt(PREF_VERSION_CODE, 1002000)) {
+                pref.edit().putInt(PREF_VERSION_CODE, BuildConfig.VERSION_CODE).apply();
+                try {
+                    DbHelper.removeHiddenSyncedFileState(context);
+                } catch (SQLiteException e) {
+                    Log.e(TAG, "Can't remove entry for hidden file in Database", e);
+                }
+            }
         }
     }
 }