diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index 738b6dc..6164251 100755
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -4,8 +4,10 @@
 
     <Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
     <Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/Zallery/" />
+    <Environment type="java.lang.String" name="WEBSITE_EMAIL" value="admin@example.com" />
+    <Environment type="java.lang.String" name="WEBSITE_EMAIL_NICE" value="Example.com Admin" />
     <Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
-    <Environment type="java.lang.String" name="DATA_PATH" value="C:\\data" />
+    <Environment type="java.lang.String" name="DATA_PATH" value="PATH TO DATA FOLDER" />
 
     <Resource
         name="jdbc/mysql"
diff --git a/src/zall/Zallery.java b/src/zall/Zallery.java
index 73e3cfb..1890c6d 100755
--- a/src/zall/Zallery.java
+++ b/src/zall/Zallery.java
@@ -19,13 +19,13 @@ import zutil.log.LogUtil;
 public class Zallery extends HttpServlet{
     private static Logger logger = LogUtil.getLogger();
 
-    public static final String VERSION = "1.0.2";
+    public static final String VERSION = "2.0.0";
 
-    public static String WEBSITE_NAME = "Example.com";
-    public static String WEBSITE_URL = "http://example.com";
-    public static String WEBSITE_EMAIL = "admin@example.com";
-    public static String WEBSITE_EMAIL_NICE = "Example.com Admin";
-    public static String SMTP_HOST = "localhost";
+    public static String WEBSITE_NAME = "";
+    public static String WEBSITE_URL = "";
+    public static String WEBSITE_EMAIL = "";
+    public static String WEBSITE_EMAIL_NICE = "";
+    public static String SMTP_HOST = "";
     public static String ROOT_PATH = "";
     public static String DATA_PATH = "";
 
@@ -43,7 +43,7 @@ public class Zallery extends HttpServlet{
         try {
             Context context = new InitialContext();
             // Check if Zallery has been properly configured
-            if ("C:\\\\data".equals(context.lookup("java:comp/env/DATA_PATH")))
+            if ("PATH TO DATA FOLDER".equals(context.lookup("java:comp/env/DATA_PATH")))
                 throw new ServletException("Zallery has not been properly configured, set proper configuration in Zallery.xml context file.");
 
             WEBSITE_NAME       = (String)context.lookup("java:comp/env/WEBSITE_NAME");
@@ -53,7 +53,7 @@ public class Zallery extends HttpServlet{
 
             WEBSITE_EMAIL      = (String)context.lookup("java:comp/env/WEBSITE_EMAIL");
             WEBSITE_EMAIL_NICE = (String)context.lookup("java:comp/env/WEBSITE_EMAIL_NICE");
-            SMTP_HOST          = (String)context.lookup("java:comp/env/WEBSITE_EMAIL_NICE");
+            SMTP_HOST          = (String)context.lookup("java:comp/env/SMTP_HOST");
             DATA_PATH          = (String)context.lookup("java:comp/env/DATA_PATH");
 
             LogUtil.setLevel("zall", Level.FINEST);