diff --git a/Classes/PhDThesisPSnPDF.cls b/Classes/PhDThesisPSnPDF.cls
index 6f9d1aa..38fba33 100644
--- a/Classes/PhDThesisPSnPDF.cls
+++ b/Classes/PhDThesisPSnPDF.cls
@@ -131,6 +131,7 @@
 
 % ***************************** Custom Margins  ********************************
 \newif\ifsetCustomMargin\setCustomMarginfalse % Set Custom Margin
+\newif\ifsetMargin\setMarginfalse % Set Custom Margin
 \DeclareOption{custommargin}{\setCustomMargintrue}
 
 % **************************** Separate Abstract  ******************************
@@ -584,6 +585,12 @@ supported!}
     \hypersetup{pdfpagelayout=OneColumn}
 \fi
 
+% Backward compatibility - setMargin is now replaced with customMargin
+\ifsetCustomMargin
+  \setMarginfalse
+\else
+  \setMargintrue
+\fi
 
 % ************************ URL Package and Definition **************************
 \RequirePackage{url}
diff --git a/thesis.pdf b/thesis.pdf
index ef0eeb1..f92938c 100644
Binary files a/thesis.pdf and b/thesis.pdf differ
diff --git a/thesis.ps b/thesis.ps
index c66a106..82f63d6 100644
--- a/thesis.ps
+++ b/thesis.ps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0
 %%Creator: dvips(k) 5.98 Copyright 2009 Radical Eye Software
 %%Title: thesis.dvi
-%%CreationDate: Mon Jun  9 16:12:46 2014
+%%CreationDate: Mon Jun  9 17:47:56 2014
 %%Pages: 39
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 596 842
@@ -12,7 +12,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -z -o thesis.ps.temp -ta4 thesis.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2014.06.09:1612
+%DVIPSSource:  TeX output 2014.06.09:1747
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S