diff --git a/Classes/PhDThesisPSnPDF.cls b/Classes/PhDThesisPSnPDF.cls
index 10d686f..d44cbe9 100644
--- a/Classes/PhDThesisPSnPDF.cls
+++ b/Classes/PhDThesisPSnPDF.cls
@@ -575,8 +575,10 @@
 }% matches Roman Symbols        > A
 
 % Add nomenclature to contents and print out nomenclature
-\newcommand{\printnomencl}{
-\printnomenclature 
+\newcommand{\printnomencl}[1][]{
+\ifthenelse{\equal {#1}{}}
+{\printnomenclature}
+{\printnomenclature[#1]} 
 \addcontentsline{toc}{chapter}{\nomname}
 }
 
diff --git a/compile-thesis-windows.bat b/compile-thesis-windows.bat
new file mode 100644
index 0000000..df91371
--- /dev/null
+++ b/compile-thesis-windows.bat
@@ -0,0 +1,47 @@
+SET FILENAME=thesis
+
+DEL "%FILENAME%.aux"
+DEL "%FILENAME%.bbl"
+DEL "%FILENAME%.blg"
+DEL "%FILENAME%.d"
+DEL "%FILENAME%.fls"
+DEL "%FILENAME%.ild"
+DEL "%FILENAME%.ind"
+DEL "%FILENAME%.toc"
+DEL "%FILENAME%.lot"
+DEL "%FILENAME%.lof"
+DEL "%FILENAME%.idx"
+DEL "%FILENAME%.out"
+DEL "%FILENAME%.nlo"
+DEL "%FILENAME%.nls"
+DEL "%FILENAME%.pdf"
+DEL "%FILENAME%.ps"
+DEL "%FILENAME%.dvi"
+
+pdflatex -interaction=nonstopmode "%FILENAME%.tex"
+bibtex "%FILENAME%.aux"
+makeindex "%FILENAME%.aux"
+makeindex "%FILENAME%.idx"
+makeindex "%FILENAME%.nlo" -s nomencl.ist -o "%FILENAME%".nls
+pdflatex -interaction=nonstopmode "%FILENAME%.tex"
+makeindex "%FILENAME%.nlo" -s nomencl.ist -o "%FILENAME%".nls
+pdflatex -interaction=nonstopmode "%FILENAME%.tex"
+
+
+DEL "%FILENAME%.aux"
+DEL "%FILENAME%.bbl"
+DEL "%FILENAME%.blg"
+DEL "%FILENAME%.d"
+DEL "%FILENAME%.fls"
+DEL "%FILENAME%.ild"
+DEL "%FILENAME%.ind"
+DEL "%FILENAME%.toc"
+DEL "%FILENAME%.lot"
+DEL "%FILENAME%.lof"
+DEL "%FILENAME%.idx"
+DEL "%FILENAME%.out"
+DEL "%FILENAME%.nlo"
+DEL "%FILENAME%.nls"
+
+
+"%FILENAME%.pdf"
diff --git a/compile-thesis.sh b/compile-thesis.sh
index 4e3c9a3..add7675 100644
--- a/compile-thesis.sh
+++ b/compile-thesis.sh
@@ -69,8 +69,9 @@ if [ $1 = $clean ]; then
 elif [ $1 = $compile ]; then
 	echo "Compiling your PhD Thesis...please wait...!"
 	pdflatex -interaction=nonstopmode $filename.tex
-	bibtex $filename.aux 
-	pdflatex -interaction=nonstopmode $filename.tex
+	bibtex $filename.aux 	
+	makeindex $filename.aux
+	makeindex $filename.idx
 	makeindex $filename.nlo -s nomencl.ist -o $filename.nls
 	pdflatex -interaction=nonstopmode $filename.tex
 	makeindex $filename.nlo -s nomencl.ist -o $filename.nls
diff --git a/thesis.pdf b/thesis.pdf
index d540a41..d1a24a4 100644
Binary files a/thesis.pdf and b/thesis.pdf differ
diff --git a/thesis.tex b/thesis.tex
index e94e75f..987c96d 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -112,9 +112,9 @@
 
 \listoftables 
 
+% \printnomenclature[space] space can be set as 2.5cm between symbol and description
 \printnomencl
 
-
 % ***********************************Main Matter***********************************
 \mainmatter