diff --git a/Test/functionList/Vimscript_by_rdipardo/unitTest.expected.result b/Test/functionList/Vimscript_by_rdipardo/unitTest.expected.result
index 9fd2f85..c28ca41 100644
--- a/Test/functionList/Vimscript_by_rdipardo/unitTest.expected.result
+++ b/Test/functionList/Vimscript_by_rdipardo/unitTest.expected.result
@@ -1 +1 @@
-{"leaves":["build_go_files"],"root":"unitTest"}
\ No newline at end of file
+{"leaves":["build_go_files","F","Baz","g","H","foo","namespaced#function","Another#namespaced#function"],"root":"unitTest"}
\ No newline at end of file
diff --git a/UDL-samples/Vimscript_by_rdipardo.vimrc b/UDL-samples/Vimscript_by_rdipardo.vimrc
index 11cc48a..b75f6b9 100644
--- a/UDL-samples/Vimscript_by_rdipardo.vimrc
+++ b/UDL-samples/Vimscript_by_rdipardo.vimrc
@@ -87,4 +87,38 @@ func! s:build_go_files() abort
   endif
 endfunc
 
+"""""""""""""""""""
+"      Tests      "
+"""""""""""""""""""
+function F(x)
+  echom 'Pass'
+endfunction
+
+func Baz(x, y)
+  echom 'Pass'
+endfunc
+
+function! s:g(x)
+  echom 'Pass'
+endfunction
+
+function! s:H(x)
+  echom 'Pass'
+endfunction
+
+func! s:foo(x, y)
+  echom 'Pass'
+endfunc
+
+func! namespaced#function(...)
+  echom 'Pass'
+endfunc
+
+func! Another#namespaced#function(...)
+  echom 'Pass'
+endfunc
+
+" func IgnoreMe()
+" endfunc
+
 " vim: syntax=vim
diff --git a/functionList/Vimscript_by_rdipardo.xml b/functionList/Vimscript_by_rdipardo.xml
index 367c900..3b4adc3 100644
--- a/functionList/Vimscript_by_rdipardo.xml
+++ b/functionList/Vimscript_by_rdipardo.xml
@@ -13,15 +13,15 @@
 		<!-- based on rules https://learnvim.irian.to/vimscript/vimscript_functions -->
 
 		<parser
-			id="vimscript_fuunc"
+			id="vimscript_func"
 			displayName="Vim Script"
-			commentExpr="(?-s:#.*)"
+			commentExpr="(?-s:&quot;.*)"
 		>
 			<function
-				mainExpr="^\h*func(tion)?!?\h+(?-i:\u|s:\l?)\w+"
+				mainExpr="^\h*func(tion)?!?\h+(?-i:\u|(s:(?!\w+#)|(\w+#)+)\l?)(#?\w)*"
 			>
 				<functionName>
-					<nameExpr expr="^\h*func(tion)?!?\h+\K(?-i:\u|s:\K\l?)\w+" />
+					<nameExpr expr="^\h*func(tion)?!?\h+\K(?-i:\u|(s:\K|(\w+#)+)\l?)(#?\w)*" />
 				</functionName>
 			</function>
 		</parser>