diff --git a/vim/vimrc b/vim/vimrc
index dc514f9..876212b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -26,6 +26,7 @@ if filereadable(expand("$HOME/.vim/bundle/vundle/README.md"))
 
     Bundle 'goldfeld/vim-seek'
     Bundle 'Lokaltog/vim-easymotion'
+    Bundle 'ton/vim-bufsurf'
 
     Bundle 'Gundo'
     Bundle 'The-NERD-tree'
@@ -51,6 +52,7 @@ set smarttab
 set autoindent
 set nowrap
 
+set hidden
 set ruler
 set showcmd
 set fileencoding=utf-8
@@ -130,6 +132,11 @@ map <F11> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
 map <F12> ggVGg?
 
 nnoremap <silent> <leader>r :call NumberToggle()<CR>
+
+nnoremap <silent> ,bp :bprevious<CR>
+nnoremap <silent> ,bf :bnext<CR>
+nnoremap <silent> ,Bp :BufSurfBack<CR>
+nnoremap <silent> ,Bf :BufSurfForward<CR>
 " }
 
 " PLUGINS