diff --git a/README b/README
deleted file mode 100644
index bfc7893..0000000
--- a/README
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a mirror of http://www.vim.org/scripts/script.php?script_id=1875
-
-Two emacs verilog-mode functions are mapped.
-\a expands all the verilog-mode autos (similar to C-c C-a in emacs).
-\d collapses all the verilog-mode autos (similar to C-c C-d in emacs).
-
-Previously if I wanted to update verilog-mode autos, I would
-   save and quit vim
-   fire up emacs
-   do the auto commands
-   save and close emacs
-   fire up vim.
-And in doing so, I would lose all the edit history in vim.
-With this I can just type \a and keep all the previous edit history for undos.
-
-This is my first attempt at writing a vim plugin. Code should be simple enough for an average Verilog user to take and fix/enhance according to needs. Doing :he plugin, :he write-plugin, or :he plugin-details should reveal how simple this really is.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d9f28a1
--- /dev/null
+++ b/README.md
@@ -0,0 +1,59 @@
+# verilog_emacsauto
+
+## Introduction
+This is one improved version of [original verilog mode](https://github.com/vim-scripts/verilog_emacsauto.vim)
+There are several issues in origional version:
+- doesn't work on windows
+- need enter "any key" twice to continue 
+- doesn't work for systemverilog
+
+## Installation
+
+### vim-plug
+```vimscript
+Plug 'zhuzhzh/verilog_emacsauto.vim', {'for': ['verilog', 'systemverilog'] }
+```
+
+### Vundle
+```vimscript
+Plugin 'zhuzhzh/verilog_emacsauto.vim'
+```
+
+## Windows
+In order to work on windows, you need to install unix bins for windows.
+Actually, git-for-windows already contains it.
+Please add the path like D:\Git\usr\bin to system variable PATH
+The bin path including emacs also needs to be added to PATH
+if it still doesn't work , please consider to use the absolute path.
+```vimscript
+function s:Add()
+   if &expandtab
+      let s:save_tabstop = &tabstop
+      let &tabstop=8
+   endif
+   " a tmp file is need 'cause emacs doesn't support the stdin to stdout flow
+   " maybe add /tmp to the temporary filename
+   w! %.emacsautotmp
+   !"D:\Program Files\emacs\bin\emacs.exe" -batch -l "D:\Program Files\emacs\share\emacs\site-lisp\verilog-mode.el" %.emacsautotmp -f verilog-batch-auto
+   %!"D:\Git\usr\bin\cat.exe" %.emacsautotmp 
+   if &expandtab
+      retab
+      let &tabstop=s:save_tabstop
+   endif
+   !"D:\Git\usr\bin\rm.exe" %.emacsautotmp
+endfunction
+```
+
+## Feature
+Two emacs verilog-mode functions are mapped.
+- \<Leader>a expands all the verilog-mode autos (similar to C-c C-a in emacs).
+- \<Leader>d collapses all the verilog-mode autos (similar to C-c C-d in emacs).
+
+## config
+User can define the shortkeys for auto-add and auto-delete. Here is the example.
+```vim
+let g:VerilogModeAddKey = <Leader>va
+let g:VerilogModeDeleteKey = <Leader>vd
+let g:VerilogModePath = ~/.elisp/verilog-mode.el
+``
+
diff --git a/ftplugin/verilog_emacsauto.vim b/ftplugin/verilog_emacsauto.vim
deleted file mode 100644
index 66e2484..0000000
--- a/ftplugin/verilog_emacsauto.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-" Vim filetype plugin for using emacs verilog-mode
-" Last Change: 2007 August 29
-" Maintainer:  Seong Kang <seongk@wwcoms.com>
-" License:     This file is placed in the public domain.
-
-" comment out these two lines
-" if you don't want folding or if you prefer other folding methods
-setlocal foldmethod=expr
-setlocal foldexpr=VerilogEmacsAutoFoldLevel(v:lnum)
-
-if exists("loaded_verilog_emacsauto")
-   finish
-endif
-let loaded_verilog_emacsauto = 1
-
-" map \a, \d pair to Add and Delete functions, assuming \ is the leader
-" alternatively, map C-A, C-D to Add and Delete functions
-if !hasmapto('<Plug>VerilogEmacsAutoAdd')
-   map <unique> <Leader>a <Plug>VerilogEmacsAutoAdd
-   "map <unique> <C-A> <Plug>VerilogEmacsAutoAdd
-endif
-if !hasmapto('<Plug>VerilogEmacsAutoDelete')
-   map <unique> <Leader>d <Plug>VerilogEmacsAutoDelete
-   "map <unique> <C-D> <Plug>VerilogEmacsAutoDelete
-endif
-
-noremap <unique> <script> <Plug>VerilogEmacsAutoAdd    <SID>Add
-noremap <unique> <script> <Plug>VerilogEmacsAutoDelete <SID>Delete
-noremap <SID>Add    :call <SID>Add()<CR>
-noremap <SID>Delete :call <SID>Delete()<CR>
-" add menu items for gvim
-noremenu <script> Plugin.Verilog\ AddAuto    <SID>Add
-noremenu <script> Plugin.Verilog\ DeleteAuto <SID>Delete
-
-" Add function
-" saves current document to a temporary file
-" runs the temporary file through emacs
-" replaces current document with the emacs filtered temporary file
-" removes temporary file
-" also replaces emacs generated tabs with spaces if expandtab is set
-" comment out the two if blocks to leave the tabs alone
-function s:Add()
-   if &expandtab
-      let s:save_tabstop = &tabstop
-      let &tabstop=8
-   endif
-   " a tmp file is need 'cause emacs doesn't support the stdin to stdout flow
-   " maybe add /tmp to the temporary filename
-   w! %.emacsautotmp
-   !emacs -batch -l ~/elisp/verilog-mode.el %.emacsautotmp -f verilog-batch-auto
-   %!cat %.emacsautotmp 
-   if &expandtab
-      retab
-      let &tabstop=s:save_tabstop
-   endif
-   !rm %.emacsautotmp
-endfunction
-
-" Delete function
-" saves current document to a temporary file
-" runs the temporary file through emacs
-" replaces current document with the emacs filtered temporary file
-" removes temporary file
-function s:Delete()
-   " a tmp file is need 'cause emacs doesn't support the stdin to stdout flow
-   " maybe add /tmp to the temporary filename
-   w! %.emacsautotmp
-   !emacs -batch -l ~/elisp/verilog-mode.el %.emacsautotmp -f verilog-batch-delete-auto
-   %!cat %.emacsautotmp 
-   !rm %.emacsautotmp
-endfunction
-
-" VerilogEmacsAutoFoldLevel function
-" only deals with 0 and 1 levels
-function VerilogEmacsAutoFoldLevel(l)
-   if (getline(a:l-1)=~'\/\*A\S*\*\/' && getline(a:l)=~'\/\/ \(Outputs\|Inputs\|Inouts\|Beginning\)')
-      return 1
-   endif
-   if (getline(a:l-1)=~'\(End of automatics\|);\)')
-      return 0
-   endif
-   return '='
-endfunction
diff --git a/plugin/systemverilog_emacsauto.vim b/plugin/systemverilog_emacsauto.vim
new file mode 100755
index 0000000..b86dbd9
--- /dev/null
+++ b/plugin/systemverilog_emacsauto.vim
@@ -0,0 +1,132 @@
+" Vim filetype plugin for using emacs verilog-mode
+" Last Change: 2018 August 28
+" Origin Author:  Seong Kang <seongk@wwcoms.com>
+" Author: Harris Zhu <zhuzhzh@163.com>
+" License:     This file is placed in the public domain.
+
+" comment out these two lines
+" if you don't want folding or if you prefer other folding methods
+"setlocal foldmethod=expr
+"setlocal foldexpr=VerilogEmacsAutoFoldLevel(v:lnum)
+
+if exists("loaded_verilog_emacsauto")
+   finish
+endif
+let loaded_verilog_emacsauto = 1
+
+function! s:InitVar(var, value)
+    if !exists(a:var)
+        exec 'let '.a:var.'='.string(a:value)
+    endif
+endfunction
+" map \a, \d pair to Add and Delete functions, assuming \ is the leader
+" alternatively, map C-A, C-D to Add and Delete functions
+
+let s_DefaultPath = expand("$HOME") . "/.elisp/verilog-mode.el"
+
+call s:InitVar('g:VerilogModeAddKey', '<leader>a')
+call s:InitVar('g:VerilogModeDeleteKey', '<leader>d')
+call s:InitVar('g:VerilogModeFile', s_DefaultPath)
+call s:InitVar('g:VerilogModeTrace', 0)
+
+"if !hasmapto('<Plug>VerilogEmacsAutoAdd')
+"map <unique> <leader>a <Plug>VerilogEmacsAutoAdd
+"endif
+try
+    if g:VerilogModeAddKey != ""
+        exec 'nnoremap <silent><unique> ' g:VerilogModeAddKey '<Plug>VerilogEmacsAutoAdd'
+    endif
+catch /^Vim\%((\a\+)\)\=:E227/
+endtry
+
+"if !hasmapto('<Plug>VerilogEmacsAutoDelete')
+"   map <unique> <leader>d <Plug>VerilogEmacsAutoDelete
+"endif
+try
+    if g:VerilogModeDeleteKey != ""
+        exec 'nnoremap <silent><unique> ' g:VerilogModeDeleteKey '<Plug>VerilogEmacsAutoDelete'
+    endif
+catch /^Vim\%((\a\+)\)\=:E227/
+endtry
+
+
+
+noremap <unique> <script> <Plug>VerilogEmacsAutoAdd    <SID>Add
+noremap <unique> <script> <Plug>VerilogEmacsAutoDelete <SID>Delete
+noremap <SID>Add    :call <SID>Add()<CR>
+noremap <SID>Delete :call <SID>Delete()<CR>
+" add menu items for gvim
+noremenu <script> Verilog-Mode.AddAuto    <SID>Add
+noremenu <script> Verilog-Mode.DeleteAuto <SID>Delete
+
+let s:is_win = has('win16') || has('win32') || has('win64')
+
+" Add function
+" saves current document to a temporary file
+" runs the temporary file through emacs
+" replaces current document with the emacs filtered temporary file
+" removes temporary file
+" also replaces emacs generated tabs with spaces if expandtab is set
+" comment out the two if blocks to leave the tabs alone
+function s:Add()
+   if &expandtab
+      let s:save_tabstop = &tabstop
+      let &tabstop=8
+   endif
+   " a tmp file is need 'cause emacs doesn't support the stdin to stdout flow
+   " maybe add /tmp to the temporary filename
+   let l:tmpfile = expand("%:p:h") . "/." . expand("%:p:t")
+   "echom l:tmpfile
+   silent! call writefile(getline(1, "$"), fnameescape(l:tmpfile), '')
+   if g:VerilogModeTrace
+	   exec "silent !emacs -batch --no-site-file -l ". g:VerilogModeFile . " " . shellescape(l:tmpfile, 1) . " -f verilog-batch-auto"
+   else
+	   exec "silent !emacs -batch --no-site-file -l ". g:VerilogModeFile . " " . shellescape(l:tmpfile, 1) . " -f verilog-batch-auto 2> /dev/null"
+   endif
+   let l:newcontent = readfile(fnameescape(l:tmpfile), '')
+   
+   if &expandtab
+      retab
+      let &tabstop=s:save_tabstop
+   endif
+   "call deletebufline('.', 1, '$')
+   let l:i=1
+   call setline(1, l:newcontent)
+   exec "silent !rm " . shellescape(l:tmpfile)
+   w! %
+   exec 'redraw!'
+endfunction
+
+" Delete function
+" saves current document to a temporary file
+" runs the temporary file through emacs
+" replaces current document with the emacs filtered temporary file
+" removes temporary file
+function s:Delete()
+   " a tmp file is need 'cause emacs doesn't support the stdin to stdout flow
+   " maybe add /tmp to the temporary filename
+   let l:tmpfile = expand("%:p:h") . "/." . expand("%:p:t")
+   "exec 'wrtie'   fnameescape(l:tmpfile)
+   silent! call writefile(getline(1, "$"), fnameescape(l:tmpfile), '')
+   if g:VerilogModeTrace
+	   exec "silent !emacs -batch --no-site-file -l " . g:VerilogModeFile . " " . l:tmpfile . " -f verilog-batch-delete-auto"
+   else
+	   exec "silent !emacs -batch --no-site-file -l " . g:VerilogModeFile . " " . l:tmpfile . " -f verilog-batch-delete-auto 2> /dev/null"
+   endif
+   exec "silent %!cat " . shellescape(l:tmpfile)
+   exec "silent !rm " . shellescape(l:tmpfile)
+   w! %
+   exec 'redraw!'
+endfunction
+
+" VerilogEmacsAutoFoldLevel function
+" only deals with 0 and 1 levels
+function VerilogEmacsAutoFoldLevel(l)
+   if (getline(a:l-1)=~'\/\*A\S*\*\/' && getline(a:l)=~'\/\/ \(Outputs\|Inputs\|Inouts\|Beginning\)')
+      return 1
+   endif
+   if (getline(a:l-1)=~'\(End of automatics\|);\)')
+      return 0
+   endif
+   return '='
+endfunction