diff --git a/autoload/UltiSnips/map_keys.vim b/autoload/UltiSnips/map_keys.vim
index a60d00ef..34cd864d 100644
--- a/autoload/UltiSnips/map_keys.vim
+++ b/autoload/UltiSnips/map_keys.vim
@@ -6,18 +6,26 @@ function! UltiSnips#map_keys#MapKeys()
         return
     endif
 
+    inoremap <Plug>(UltiSnips#ExpandSnippetOrJump) <C-R>=UltiSnips#ExpandSnippetOrJump()<cr>
+    snoremap <Plug>(UltiSnips#ExpandSnippetOrJump) <Esc>:call UltiSnips#ExpandSnippetOrJump()<cr>
+    inoremap <Plug>(UltiSnips#ExpandSnippet) <C-R>=UltiSnips#ExpandSnippet()<cr>
+    snoremap <Plug>(UltiSnips#ExpandSnippet) <Esc>:call UltiSnips#ExpandSnippet()<cr>
+    xnoremap <Plug>(UltiSnips#SaveLastVisualSelection) :call UltiSnips#SaveLastVisualSelection()<cr>gvs
+    inoremap <Plug>(UltiSnips#ListSnippets) <C-R>=UltiSnips#ListSnippets()<cr>
+    snoremap <Plug>(UltiSnips#ListSnippets) <Esc>:call UltiSnips#ListSnippets()<cr>
+
     " Map the keys correctly
     if g:UltiSnipsExpandTrigger == g:UltiSnipsJumpForwardTrigger
 
-        exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=UltiSnips#ExpandSnippetOrJump()<cr>"
-        exec "snoremap <silent> " . g:UltiSnipsExpandTrigger . " <Esc>:call UltiSnips#ExpandSnippetOrJump()<cr>"
+        exec "imap <silent> " . g:UltiSnipsExpandTrigger . " <Plug>(UltiSnips#ExpandSnippetOrJump)"
+        exec "smap <silent> " . g:UltiSnipsExpandTrigger . " <Plug>(UltiSnips#ExpandSnippetOrJump)"
     else
-        exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=UltiSnips#ExpandSnippet()<cr>"
-        exec "snoremap <silent> " . g:UltiSnipsExpandTrigger . " <Esc>:call UltiSnips#ExpandSnippet()<cr>"
+        exec "imap <silent> " . g:UltiSnipsExpandTrigger . " <Plug>(UltiSnips#ExpandSnippet)"
+        exec "smap <silent> " . g:UltiSnipsExpandTrigger . " <Plug>(UltiSnips#ExpandSnippet)"
     endif
-    exec "xnoremap <silent> " . g:UltiSnipsExpandTrigger. " :call UltiSnips#SaveLastVisualSelection()<cr>gvs"
-    exec "inoremap <silent> " . g:UltiSnipsListSnippets . " <C-R>=UltiSnips#ListSnippets()<cr>"
-    exec "snoremap <silent> " . g:UltiSnipsListSnippets . " <Esc>:call UltiSnips#ListSnippets()<cr>"
+    exec "xmap <silent> " . g:UltiSnipsExpandTrigger. " <Plug>(UltiSnips#SaveLastVisualSelection)"
+    exec "imap <silent> " . g:UltiSnipsListSnippets . " <Plug>(UltiSnips#ListSnippets)"
+    exec "smap <silent> " . g:UltiSnipsListSnippets . " <Plug>(UltiSnips#ListSnippets)"
 
     snoremap <silent> <BS> <c-g>c
     snoremap <silent> <DEL> <c-g>c
diff --git a/doc/UltiSnips.txt b/doc/UltiSnips.txt
index 17c0b1f1..a8f6b915 100644
--- a/doc/UltiSnips.txt
+++ b/doc/UltiSnips.txt
@@ -1535,6 +1535,7 @@ individuals have contributed to UltiSnips (in chronological order):
    Dettorer - dettorer
    Zhao Jiarong - kawing-chiu
    Ye Ding - dyng
+   mattn
 
 
 Thank you for your support.