diff --git a/Makefile b/Makefile
index f319912..aae66c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
 PLUGIN=delimitMate
+VIMFOLDER=~/.vim
 
 install:
-	install -m 755 -d ~/.vim
-	install -m 755 -d ~/.vim/plugin/
-	install -m 755 -d ~/.vim/autoload/
-	install -m 755 -d ~/.vim/doc/
-	cp -f doc/${PLUGIN}.txt      ~/.vim/doc/${PLUGIN}.txt
-	cp -f plugin/${PLUGIN}.vim   ~/.vim/plugin/${PLUGIN}.vim
-	cp -f autoload/${PLUGIN}.vim ~/.vim/autoload/${PLUGIN}.vim
-	cp -f autoload/${PLUGIN}Tests.vim ~/.vim/autoload/${PLUGIN}Tests.vim
+	install -m 755 -d ${VIMFOLDER}
+	install -m 755 -d ${VIMFOLDER}/plugin/
+	install -m 755 -d ${VIMFOLDER}/autoload/
+	install -m 755 -d ${VIMFOLDER}/doc/
+	cp -f doc/${PLUGIN}.txt      ${VIMFOLDER}/doc/${PLUGIN}.txt
+	cp -f plugin/${PLUGIN}.vim   ${VIMFOLDER}/plugin/${PLUGIN}.vim
+	cp -f autoload/${PLUGIN}.vim ${VIMFOLDER}/autoload/${PLUGIN}.vim
+	cp -f autoload/${PLUGIN}Tests.vim ${VIMFOLDER}/autoload/${PLUGIN}Tests.vim
 
 doc_update: install
-	/usr/bin/vim -u NONE -c ':helptags ~/.vim/doc' -c ':q'
+	/usr/bin/vim -u NONE -c ':helptags ${VIMFOLDER}/doc' -c ':q'
 
 zip:
 	zip -r ${PLUGIN}.zip doc plugin autoload
@@ -27,3 +28,8 @@ vimball: install
 gzip: vimball
 	gzip -f ${PLUGIN}.vba
 
+uninstall:
+	rm -f ${VIMFOLDER}/plugin/${PLUGIN}.vim
+	rm -f ${VIMFOLDER}/autoload/${PLUGIN}.vim
+	rm -f ${VIMFOLDER}/doc/${PLUGIN}.txt
+	rm -f ${VIMFOLDER}/autoload/${PLUGIN}Tests.txt
diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index 09eecfc..713829f 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -494,8 +494,12 @@ function! delimitMate#Finish() " {{{
 		let b:delimitMate_buffer = []
 		let line = getline('.')
 		let col = col('.') -2
-		"echom 'col: ' . col . '-' . line[:col] . "|" . line[col+len+1:] . '%' . buffer
-		call setline('.', line[:col] . line[col+len+1:])
+		echom 'col: ' . col . '-' . line[:col] . "|" . line[col+len+1:] . '%' . buffer
+		if col < 0
+			call setline('.', line[col+len+1:])
+		else
+			call setline('.', line[:col] . line[col+len+1:])
+		endif
 		let i = 1
 		let lefts = "\<Left>"
 		while i < len
diff --git a/autoload/delimitMateTests.vim b/autoload/delimitMateTests.vim
index 0cc8b5a..77f8374 100644
--- a/autoload/delimitMateTests.vim
+++ b/autoload/delimitMateTests.vim
@@ -203,6 +203,9 @@ function! delimitMateTests#Main() " {{{
 	unlet g:delimitMate_excluded_ft
 	set ft=
 
+	" Duplicated delimiter after CR
+	call Type("Duplicated delimiter after CR", "(\<CR>", ['(', '|)'], [])
+
 	"}}}
 
 	" Show results: {{{