#7 done
diff --git a/core/src/main/jjtree/Markdown.jjt b/core/src/main/jjtree/Markdown.jjt
index 00e0f7b..c6e1b70 100644
--- a/core/src/main/jjtree/Markdown.jjt
+++ b/core/src/main/jjtree/Markdown.jjt
@@ -308,12 +308,12 @@
 
 TOKEN : {
     < CODE_SPAN : "`" ( ~["`", "\r", "\n"] )+ "`" | "`" "`" ( ~["'", "\r", "\n"] )+ "`" "`" >
-    | < EMPHASIS_ITALIC : "*" <EMP_A> ( ( ~["*"] )* <EMP_A> )? "*"
-                    | "_" <EMP_U> ( ( ~["_"] )* <EMP_U> )? "_">
-    | < EMPHASIS_BOLD : "**" <EMP_A> ( ( ~["*"] )* <EMP_A> )? "**"
-                    | "__" <EMP_U> ( ( ~["_"] )* <EMP_U> )? "__">
-    | < EMPHASIS_ITALIC_BOLD : "***" <EMP_A> ( ( ~["*"] )* <EMP_A> )? "***"
-                    | "___" <EMP_U> ( ( ~["_"] )* <EMP_U> )? "___">
+    | < EMPHASIS_ITALIC : "*" <EMP_A> ( ( ~["*", "\r", "\n"] )* <EMP_A> )? "*"
+                    | "_" <EMP_U> ( ( ~["_", "\r", "\n"] )* <EMP_U> )? "_">
+    | < EMPHASIS_BOLD : "**" <EMP_A> ( ( ~["*", "\r", "\n"] )* <EMP_A> )? "**"
+                    | "__" <EMP_U> ( ( ~["_", "\r", "\n"] )* <EMP_U> )? "__">
+    | < EMPHASIS_ITALIC_BOLD : "***" <EMP_A> ( ( ~["*", "\r", "\n"] )* <EMP_A> )? "***"
+                    | "___" <EMP_U> ( ( ~["_", "\r", "\n"] )* <EMP_U> )? "___">
     | < NUMBERING : ( ["0"-"9"] )+ "." >
     | < #EMP_A : ~["*", " ", "\t", "\r", "\n"] >
     | < #EMP_U : ~["_", " ", "\t", "\r", "\n"] >
diff --git a/core/src/test/java/org/tautua/markdownpapers/ParserTest.java b/core/src/test/java/org/tautua/markdownpapers/ParserTest.java
index 06df306..cf8b6a5 100644
--- a/core/src/test/java/org/tautua/markdownpapers/ParserTest.java
+++ b/core/src/test/java/org/tautua/markdownpapers/ParserTest.java
@@ -52,7 +52,8 @@
                 {getAssetReader("quotes")},
                 {getAssetReader("rulers")},
                 {getAssetReader("snippets")},
-                {getAssetReader("tags")}
+                {getAssetReader("tags")},
+                {getAssetReader("underscore")},
             });
     }
 
diff --git a/core/src/test/resources/underscore.text b/core/src/test/resources/underscore.text
new file mode 100644
index 0000000..ae29d28
--- /dev/null
+++ b/core/src/test/resources/underscore.text
@@ -0,0 +1,10 @@
+# First header

+

+*	Invisible underscore: _, c.  

+

+# Second header

+

+*	Invisible underscore: myimage_widthxheight.png

+

+	

+	
\ No newline at end of file