diff --git a/.vimrc b/.vimrc
index 7d000ad..4daf20e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -450,7 +450,8 @@ let OmniCpp_LocalSearchDecl=1
 let OmniCpp_MayCompleteDot = 1 " autocomplete after .
 let OmniCpp_MayCompleteArrow = 1 " autocomplete after ->
 let OmniCpp_MayCompleteScope = 1 " autocomplete after ::
-set path+=..,/usr/local/include,/usr/include
+set path+=..
+"**,/usr/local/include,/usr/include
 
 """""""""""""
 " Latex		"
@@ -477,7 +478,10 @@ cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
 " NerdTree
 """""""""""
 augroup NerdGroup
-        autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+        " Exit Vim if NERDTree is the only window remaining in the only tab.
+        autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
+        " Close the tab if NERDTree is the only window remaining in it.
+        autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
         map <F9>   :NERDTreeToggle<CR>
         let NERDTreeIgnore= ['\.o$', '\.d$']
 augroup END
@@ -621,7 +625,7 @@ let g:UltiSnipsJumpForwardTrigger = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 
 " Filesystem exploration
-Plugin 'scrooloose/nerdtree'
+Plugin 'preservim/nerdtree'
 
 " Python completion
 "Plugin 'klen/python-mode'