diff --git a/core/libs/image-importer/pom.xml b/core/libs/image-importer/pom.xml
index d392952..22db47e 100644
--- a/core/libs/image-importer/pom.xml
+++ b/core/libs/image-importer/pom.xml
@@ -44,6 +44,11 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
 		<!-- Embedded mongo -->
 		<!-- dependency>
diff --git a/core/libs/image-importer/src/main/java/gallerymine/backend/analyzer/IgnorableFileAnayser.java b/core/libs/image-importer/src/main/java/gallerymine/backend/analyzer/IgnorableFileAnayser.java
index 451e5aa..716a287 100644
--- a/core/libs/image-importer/src/main/java/gallerymine/backend/analyzer/IgnorableFileAnayser.java
+++ b/core/libs/image-importer/src/main/java/gallerymine/backend/analyzer/IgnorableFileAnayser.java
@@ -1,6 +1,7 @@
 package gallerymine.backend.analyzer;
 
 import com.google.common.collect.Sets;
+import org.apache.commons.io.FilenameUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Set;
@@ -9,11 +10,13 @@
 public class IgnorableFileAnayser {
 
     public static final Set<String> skippableFiles = Sets.newHashSet(
-            ".DS_Store"
+            ".DS_Store",
+            "read.me",
+            "README.md"
     );
 
     public static final Set<String> skippableExtensions = Sets.newHashSet(
-            ".DS_Store"
+            "txt"
     );
 
     public boolean accepts(String fileName) {
@@ -26,7 +29,7 @@ public boolean accepts(String fileName) {
             return true;
         }
 
-        String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1);
+        String fileExt = FilenameUtils.getExtension(fileName);
 
         if (skippableExtensions.contains(fileExt)) {
             return true;
diff --git a/core/libs/image-importer/src/test/java/gallerymine/backend/analyzer/IgnorableFileAnayserTest.java b/core/libs/image-importer/src/test/java/gallerymine/backend/analyzer/IgnorableFileAnayserTest.java
new file mode 100644
index 0000000..e185a08
--- /dev/null
+++ b/core/libs/image-importer/src/test/java/gallerymine/backend/analyzer/IgnorableFileAnayserTest.java
@@ -0,0 +1,18 @@
+package gallerymine.backend.analyzer;
+
+import static org.junit.Assert.*;
+
+public class IgnorableFileAnayserTest {
+
+    IgnorableFileAnayser analyser = new IgnorableFileAnayser();
+
+    @org.junit.Test
+    public void accepts() {
+        assertTrue("System file was not ignored", analyser.accepts(".git"));
+        assertTrue("Mac thumb file was not ignored", analyser.accepts(".DS_Store"));
+        assertTrue("Text read.me file was not ignored", analyser.accepts("read.me"));
+        assertTrue("Git readme.md file was not ignored", analyser.accepts("README.md"));
+        assertTrue("Text file was not ignored", analyser.accepts("sample.txt"));
+        assertFalse("JPEG file was ignored", analyser.accepts("sample.jpg"));
+    }
+}
\ No newline at end of file