diff --git a/vimrc b/vimrc
index 78b09e8..ab557cb 100644
--- a/vimrc
+++ b/vimrc
@@ -652,6 +652,13 @@ function! s:backtick_op(type)
 endf
 nnoremap <leader>` :<C-U>set operatorfunc=<SID>backtick_op<CR>g@
 vnoremap <leader>` :<C-U>call <SID>vsurround("`", "`")<CR>
+
+function! s:asterisk_op(type)
+  normal `[m<`]m>
+  call <SID>surround(a:type, "*", "*")
+endf
+nnoremap <leader>* :<C-U>set operatorfunc=<SID>asterisk_op<CR>g@
+vnoremap <leader>* :<C-U>call <SID>vsurround("*", "*")<CR>
 " --- END OF SURROUND MAPPINGS ---
 
 nnoremap <S-l> :L<cr>
@@ -715,10 +722,6 @@ nnoremap [p :let [content, type]=
 nnoremap <leader><CR> o0
 nnoremap <leader><leader><CR> O0
 
-" Markdown Stuff
-vnoremap * <C-c>`>a*<C-c>`<i*<C-c>
-vnoremap _ <C-c>`>a__<C-c>`<i__<C-c>
-
 " === GENERAL ABBREVIATIONS ===
 cabbr rcpath fnamemodify($MYVIMRC, ":p:h")